X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=a7a06ff0d82a1ba88ac1f1a67a4346f2fc00ceb0;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=171d5ae73f1ef837493e63a10423de3ccf3260a6;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 171d5ae73f..a7a06ff0d8 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -85,7 +85,7 @@ Music_iterator::get_static_get_iterator (Music *m)
   if (ly_is_procedure (ctor))
     {
       iter = scm_call_0 (ctor);
-      p = Music_iterator::unsmob (iter);
+      p = unsmob<Music_iterator> (iter);
     }
   else
     {
@@ -132,9 +132,12 @@ Music_iterator::init_context (Music *m, Context *report)
 void
 Music_iterator::substitute_outlet (Context *f, Context *t)
 {
-  if (get_outlet () == f)
-    set_context (t);
-  derived_substitute (f, t);
+  if (f != t)
+    {
+      if (get_outlet () == f)
+        set_context (t);
+      derived_substitute (f, t);
+    }
 }
 
 void
@@ -146,7 +149,7 @@ SCM
 Music_iterator::get_iterator (Music *m) const
 {
   SCM ip = get_static_get_iterator (m);
-  Music_iterator *p = Music_iterator::unsmob (ip);
+  Music_iterator *p = unsmob<Music_iterator> (ip);
 
   p->init_context (m, get_outlet ());
 
@@ -187,10 +190,10 @@ Music_iterator::get_music () const
 
 /****************************************************************/
 
-const char Music_iterator::type_p_name_[] = "ly:iterator?";
+const char * const Music_iterator::type_p_name_ = "ly:iterator?";
 
 SCM
-Music_iterator::mark_smob ()
+Music_iterator::mark_smob () const
 {
   derived_mark ();
   /*
@@ -209,7 +212,7 @@ Music_iterator::mark_smob ()
 }
 
 int
-Music_iterator::print_smob (SCM port, scm_print_state *)
+Music_iterator::print_smob (SCM port, scm_print_state *) const
 {
   char s[1000];