X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-rest-engraver.cc;h=8f809fde7021f9cd7cc9a175602ef6cbc1435b61;hb=0b49f20966fb8b4e9c9d8ed5699efcff9f805564;hp=a60b400efce786fcf6c36de6958f8f61d42e2f82;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/completion-rest-engraver.cc b/lily/completion-rest-engraver.cc
index a60b400efc..8f809fde70 100644
--- a/lily/completion-rest-engraver.cc
+++ b/lily/completion-rest-engraver.cc
@@ -19,6 +19,7 @@
 */
 
 #include <cctype>
+using namespace std;
 
 #include "dot-column.hh"
 #include "dots.hh"
@@ -39,8 +40,6 @@
 
 #include "translator.icc"
 
-using std::vector;
-
 /*
   How does this work?
 
@@ -96,7 +95,7 @@ Completion_rest_engraver::listen_rest (Stream_event *ev)
   Moment now = now_mom ();
   Moment musiclen = get_event_length (ev, now);
 
-  rest_end_mom_ = std::max (rest_end_mom_, (now + musiclen));
+  rest_end_mom_ = max (rest_end_mom_, (now + musiclen));
   do_nothing_until_ = Rational (0, 0);
 }