2003 -> 2004

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

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 3689b1348c3f05b155e0a488f4fae95e4044f729..237885d2b111b49c335d25fc47fa30f06ce9a4b2 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,9 +15,9 @@
 class Simultaneous_music_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   Simultaneous_music_iterator ();
   Simultaneous_music_iterator (Simultaneous_music_iterator const&);
+  virtual void derived_substitute (Translator_group*f, Translator_group*t) ;
   virtual void derived_mark () const;
   DECLARE_SCHEME_CALLBACK(constructor, ());
   
@@ -28,8 +28,6 @@ public:
   virtual Moment pending_moment () const;
   virtual void do_quit(); 
   virtual bool ok () const;
-  virtual SCM get_pending_events (Moment)const;
-  virtual void skip (Moment);
   virtual bool run_always () const;
   
 protected: