X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=cc5b1e31d1c2f6c92365933702744c385bfcf0c0;hb=512fc5ece5ff691520bf93badaa0a77a46370839;hp=7efa1e649cc7bc3e13c463ec765ccaac85b2b3db;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 7efa1e649c..cc5b1e31d1 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -29,8 +29,6 @@ #include "translator.icc" -using std::vector; - struct Rhythmic_tuple { Grob_info info_; @@ -222,7 +220,7 @@ Spacing_engraver::stop_translation_timestep () if (ev) { Moment m = get_event_length (ev); - shortest_playing = std::min (shortest_playing, m); + shortest_playing = min (shortest_playing, m); } } Moment starter; @@ -233,13 +231,13 @@ Spacing_engraver::stop_translation_timestep () Moment m = get_event_length (now_durations_[i].info_.event_cause ()); if (m.to_bool ()) { - starter = std::min (starter, m); + starter = min (starter, m); playing_durations_.insert (now_durations_[i]); } } now_durations_.clear (); - shortest_playing = std::min (shortest_playing, starter); + shortest_playing = min (shortest_playing, starter); assert (starter.to_bool ()); SCM sh = shortest_playing.smobbed_copy ();