Revert "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 38d9333684b7d1f959d08b901637d73b104dc140..6e8c617ef426b6b71bbfe7d0bb93aba25cf468d0 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -103,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_ = std::max (music_context_->now_mom (),
+    busy_moment_ = max (music_context_->now_mom (),
                         busy_moment_);
 
 }