X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-iterator.cc;h=c43e630c4384e51f4c0acf44a158918fb5467df8;hb=4d8ae12d918b0183f85c3b1dc93f65c7711104a3;hp=ad0d3c7361ff842924084a96545c90e1e6ccf309;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git diff --git a/lily/tuplet-iterator.cc b/lily/tuplet-iterator.cc index ad0d3c7361..c43e630c43 100644 --- a/lily/tuplet-iterator.cc +++ b/lily/tuplet-iterator.cc @@ -92,7 +92,7 @@ Moment Tuplet_iterator::pending_moment () const { Moment next_mom = Music_wrapper_iterator::pending_moment (); - next_mom = std::min (next_mom, next_split_mom_); + next_mom = min (next_mom, next_split_mom_); return next_mom; } @@ -110,7 +110,7 @@ Tuplet_iterator::process (Moment m) if (m.main_part_ < music_get_length ().main_part_) { spanner_duration_ = - std::min (music_get_length () - next_split_mom_, spanner_duration_); + min (music_get_length () - next_split_mom_, spanner_duration_); tuplet_handler_.set_context (get_outlet ()); report_event (create_event (START));