* lily/context.cc (where_defined): also assign value in

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

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index 556b68bedb2c6d5daaa7e38a0bf530441f61eba0..e7800e96e25864486f94336bb8b053bc8f4e253d 100644 (file)
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -16,6 +16,7 @@
 
 IMPLEMENT_SMOBS (Grob);
 IMPLEMENT_DEFAULT_EQUAL_P (Grob);
+IMPLEMENT_TYPE_P (Grob, "ly:grob?");
 
 SCM
 Grob::mark_smob (SCM ses)
@@ -42,10 +43,7 @@ Grob::mark_smob (SCM ses)
   if (s->original_)
     scm_gc_mark (s->original_->self_scm ());
 
-  if (s->pscore_)
-    scm_gc_mark (s->pscore_->self_scm ());
-
-  s->do_derived_mark ();
+  s->derived_mark ();
   scm_gc_mark (s->object_alist_);
   scm_gc_mark (s->interfaces_);
 
@@ -65,11 +63,7 @@ Grob::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
-SCM
-Grob::do_derived_mark () const
+void
+Grob::derived_mark () const
 {
-  return SCM_EOL;
 }
-
-IMPLEMENT_TYPE_P (Grob, "ly:grob?");
-