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

[lilypond.git] / lily / spacing-engraver.cc

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index cc5b1e31d1c2f6c92365933702744c385bfcf0c0..7efa1e649cc7bc3e13c463ec765ccaac85b2b3db 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -29,6 +29,8 @@
 
 #include "translator.icc"
 
+using std::vector;
+
 struct Rhythmic_tuple
 {
   Grob_info info_;
@@ -220,7 +222,7 @@ Spacing_engraver::stop_translation_timestep ()
       if (ev)
         {
           Moment m = get_event_length (ev);
-          shortest_playing = min (shortest_playing, m);
+          shortest_playing = std::min (shortest_playing, m);
         }
     }
   Moment starter;
@@ -231,13 +233,13 @@ Spacing_engraver::stop_translation_timestep ()
       Moment m = get_event_length (now_durations_[i].info_.event_cause ());
       if (m.to_bool ())
         {
-          starter = min (starter, m);
+          starter = std::min (starter, m);
           playing_durations_.insert (now_durations_[i]);
         }
     }
   now_durations_.clear ();
 
-  shortest_playing = min (shortest_playing, starter);
+  shortest_playing = std::min (shortest_playing, starter);
 
   assert (starter.to_bool ());
   SCM sh = shortest_playing.smobbed_copy ();