X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=c4cf900dca52d6ea51c5fc2f16bebbf7afae0fcd;hb=78fab0cd2b9f3f568e9b97b313e33f28d7077223;hp=ce0bf4140e8b0a00b9a78b1ede73431d5fac55a4;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ce0bf4140e..c4cf900dca 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -78,7 +78,7 @@ Music_iterator::get_static_get_iterator (Music *m)
 
   SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (is_procedure (ctor))
+  if (ly_c_procedure_p (ctor))
     {
       iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
@@ -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;