Merge branch 'issue4096' into HEAD

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index f6367db129620230d1d56be339a194a0a9f163d0..3647d4dc46bbd95c2b35e45a87960d7232718bc4 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -30,7 +30,6 @@ using namespace std;
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
 
-#include "ly-smobs.icc"
 
 Music_iterator::Music_iterator ()
 {
@@ -91,7 +90,7 @@ Music_iterator::get_static_get_iterator (Music *m)
   if (ly_is_procedure (ctor))
     {
       iter = scm_call_0 (ctor);
-      p = unsmob_iterator (iter);
+      p = Music_iterator::unsmob (iter);
     }
   else
     {
@@ -152,7 +151,7 @@ SCM
 Music_iterator::get_iterator (Music *m) const
 {
   SCM ip = get_static_get_iterator (m);
-  Music_iterator *p = unsmob_iterator (ip);
+  Music_iterator *p = Music_iterator::unsmob (ip);
 
   p->init_context (m, get_outlet ());
 
@@ -193,9 +192,7 @@ Music_iterator::get_music () const
 
 /****************************************************************/
 
-IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
-IMPLEMENT_SMOBS (Music_iterator);
-IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator);
+const char Music_iterator::type_p_name_[] = "ly:iterator?";
 
 SCM
 Music_iterator::mark_smob (SCM smob)
@@ -223,7 +220,7 @@ Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
 {
   char s[1000];
 
-  Music_iterator *iter = unsmob_iterator (sm);
+  Music_iterator *iter = Music_iterator::unsmob (sm);
   sprintf (s, "#<%s>", iter->class_name ());
   scm_puts (s, port);
   return 1;