Run grand replace for 2015.

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 009583d8e3dbb9a45c8b0750b6f364c354528ac8..8eb238c295bc6d95e47187e6995358e9ac4ab01d 100644 (file)
--- 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
@@ -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 ()
 {
@@ -38,11 +37,6 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const &)
-{
-  assert (false);
-}
-
 Music_iterator::~Music_iterator ()
 {
 }
@@ -193,16 +187,12 @@ 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)
+Music_iterator::mark_smob ()
 {
-  Music_iterator *mus = (Music_iterator *)SCM_CELL_WORD_1 (smob);
-
-  mus->derived_mark ();
+  derived_mark ();
   /*
     Careful with GC, although we intend the following as pointers
     only, we _must_ mark them.
@@ -210,21 +200,20 @@ Music_iterator::mark_smob (SCM smob)
   /* Use handle_ directly as get_outlet is a virtual function and we
      need to protect the context until Music_iterator::quit is being
      run. */
-  if (mus->handle_.get_context ())
-    scm_gc_mark (mus->handle_.get_context ()->self_scm ());
-  if (mus->music_)
-    scm_gc_mark (mus->music_->self_scm ());
+  if (handle_.get_context ())
+    scm_gc_mark (handle_.get_context ()->self_scm ());
+  if (music_)
+    scm_gc_mark (music_->self_scm ());
 
   return SCM_EOL;
 }
 
 int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
+Music_iterator::print_smob (SCM port, scm_print_state *)
 {
   char s[1000];
 
-  Music_iterator *iter = Music_iterator::unsmob (sm);
-  sprintf (s, "#<%s>", iter->class_name ());
+  sprintf (s, "#<%s>", class_name ());
   scm_puts (s, port);
   return 1;
 }