Issue 4550 (2/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index b64251beeda3ec2a78df26f47ca288fdd68c25fb..38d9333684b7d1f959d08b901637d73b104dc140 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -26,6 +26,8 @@
 #include "music-iterator.hh"
 #include "music.hh"
 
+using std::string;
+
 /*
   This iterator is hairy.  It tracks both lyric and melody contexts,
   and has a complicated communication route, reading/writing
@@ -101,7 +103,7 @@ Lyric_combine_music_iterator::set_busy (SCM se)
   if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
       && music_context_)
 
-    busy_moment_ = max (music_context_->now_mom (),
+    busy_moment_ = std::max (music_context_->now_mom (),
                         busy_moment_);
 
 }
@@ -161,7 +163,8 @@ Lyric_combine_music_iterator::run_always () const
 bool
 Lyric_combine_music_iterator::ok () const
 {
-  return lyric_iter_ && lyric_iter_->ok ();
+  return lyric_iter_ && lyric_iter_->ok ()
+    && !(music_context_ && music_context_->is_removable ());
 }
 
 void