*** empty log message ***

[lilypond.git] / lily / music-iterator.cc

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 43e28e3ebde725b92cdeefe065d1410acc2aca41..c4cf900dca52d6ea51c5fc2f16bebbf7afae0fcd 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -78,9 +78,9 @@ Music_iterator::get_static_get_iterator (Music *m)
 
   SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (gh_procedure_p (ctor))
+  if (ly_c_procedure_p (ctor))
     {
-      iter = gh_call0 (ctor);
+      iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
     }
   else
@@ -150,7 +150,7 @@ Music_iterator::get_iterator (Music *m) const
 }
 
 /*
-  TODO: rename to prevent confusion between Translator::try_music and
+  TODO: rename to prevent confusion between Context::try_music and
   Iterator::try_music
   
  */
@@ -243,7 +243,7 @@ is_child_context (Context *me, Context *child)
 {
   while (child && child != me)
     {
-      child = child->daddy_context_;
+      child = child->get_parent_context ();
     }
   
   return child == me;