X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-smob.cc;h=590d299a503c41242c632a67bfa90b467eed6433;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e7800e96e25864486f94336bb8b053bc8f4e253d;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index e7800e96e2..590d299a50 100644
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-   
 
 #include "grob.hh"
 
 #include "paper-score.hh"
+#include "warn.hh"
 
 #include "ly-smobs.icc"
 
@@ -21,27 +20,20 @@ IMPLEMENT_TYPE_P (Grob, "ly:grob?");
 SCM
 Grob::mark_smob (SCM ses)
 {
+  ASSERT_LIVE_IS_ALLOWED ();
+  
   Grob *s = (Grob *) SCM_CELL_WORD_1 (ses);
   scm_gc_mark (s->immutable_property_alist_);
 
-  if (s->key_)
-    scm_gc_mark (s->key_->self_scm ());
-  for (int a = 0; a < 2; a++)
-    {
-      scm_gc_mark (s->dim_cache_[a].offset_callbacks_);
-      scm_gc_mark (s->dim_cache_[a].dimension_);
-      scm_gc_mark (s->dim_cache_[a].dimension_callback_);
-
-      /* Do not mark the parents.  The pointers in the mutable
-	 property list form two tree like structures (one for X
-	 relations, one for Y relations).  Marking these can be done
-	 in limited stack space.  If we add the parents, we will jump
-	 between X and Y in an erratic manner, leading to much more
-	 recursion depth (and core dumps if we link to pthreads).  */
-    }
+  /* Do not mark the parents.  The pointers in the mutable
+     property list form two tree like structures (one for X
+     relations, one for Y relations).  Marking these can be done
+     in limited stack space.  If we add the parents, we will jump
+     between X and Y in an erratic manner, leading to much more
+     recursion depth (and core dumps if we link to pthreads).  */
 
-  if (s->original_)
-    scm_gc_mark (s->original_->self_scm ());
+  if (s->original ())
+    scm_gc_mark (s->original ()->self_scm ());
 
   s->derived_mark ();
   scm_gc_mark (s->object_alist_);
@@ -56,7 +48,7 @@ Grob::print_smob (SCM s, SCM port, scm_print_state *)
   Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Grob ", port);
-  scm_puts ((char *) sc->name ().to_str0 (), port);
+  scm_puts ((char *) sc->name ().c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);