* The grand 2005-2006 replace.

[lilypond.git] / lily / grob-smob.cc

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index 15593b353a7d176039bbdbaf65a349640ccc866e..ad13ecf7c59e3b801190f9e6645b1bfb45990af8 100644 (file)
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -24,20 +24,16 @@ Grob::mark_smob (SCM ses)
 
   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_);
-
-      /* 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 ());
+
+  /* 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 ());
 
   s->derived_mark ();
   scm_gc_mark (s->object_alist_);