* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / include / lyric-combine-music-iterator.hh

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index 49251c0fe19da4e710eb5c5dee4d229ee6623565..e85fc6ab635f09c9955d84dc5fcf4c5f425281ca 100644 (file)
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -19,16 +19,16 @@ public:
   VIRTUAL_COPY_CONS (Music_iterator);
   Lyric_combine_music_iterator ();
   Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 protected:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit(); 
   virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
   
   virtual bool ok () const;
-  virtual ~Lyric_combine_music_iterator ();
-
+  virtual void derived_mark () const;
 private:
   bool get_busy_status ()const ;
   Music_iterator * music_iter_;