release: 1.3.86

[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 31a47b489655b0a072531619add3994e82eaefdb..226499611007851125a2d1a1e224bd1209331c2f 100644 (file)
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -15,10 +15,9 @@
 
 class Lyric_combine_music_iterator : public Music_iterator
 {
-public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  Lyric_combine_music_iterator ();
-
+  Music_iterator * music_iter_p_;
+  Music_iterator * lyric_iter_p_;
+  
 protected:
   virtual void construct_children ();
   virtual Moment next_moment () const;
@@ -28,10 +27,8 @@ protected:
   virtual bool ok () const;
   virtual void do_print () const;
   virtual ~Lyric_combine_music_iterator ();
-
-private:
-  Music_iterator * music_iter_p_;
-  Music_iterator * lyric_iter_p_;
+public:
+  Lyric_combine_music_iterator ();
 };
 #endif /* LYRIC_COMBINE_MUSIC_ITERATOR_HH */