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

[lilypond.git] / lily / completion-note-heads-engraver.cc

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index f590d2a40f014fabadebbae1afd7b818740c62e6..27d950b690ecbd4f8aff608bc0f3aa33946df4aa 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -18,7 +18,6 @@
 */
 
 #include <cctype>
-using namespace std;
 
 #include "dot-column.hh"
 #include "dots.hh"
@@ -39,6 +38,8 @@ using namespace std;
 
 #include "translator.icc"
 
+using std::vector;
+
 /*
   How does this work?
 
@@ -59,7 +60,7 @@ class Completion_heads_engraver : public Engraver
   vector<Item *> notes_;
   vector<Item *> prev_notes_;
   // Must remember notes for explicit ties.
-  vector<Grob *> ties_;
+  vector<Spanner *> ties_;
   vector<Stream_event *> note_events_;
   Spanner *tie_column_;
   Moment note_end_mom_;
@@ -99,7 +100,7 @@ Completion_heads_engraver::listen_note (Stream_event *ev)
   Moment now = now_mom ();
   Moment musiclen = get_event_length (ev, now);
 
-  note_end_mom_ = max (note_end_mom_, (now + musiclen));
+  note_end_mom_ = std::max (note_end_mom_, (now + musiclen));
   do_nothing_until_ = Rational (0, 0);
 }
 
@@ -271,7 +272,7 @@ Completion_heads_engraver::process_music ()
 void
 Completion_heads_engraver::make_tie (Grob *left, Grob *right)
 {
-  Grob *p = make_spanner ("Tie", SCM_EOL);
+  Spanner *p = make_spanner ("Tie", SCM_EOL);
   Tie::set_head (p, LEFT, left);
   Tie::set_head (p, RIGHT, right);
   announce_end_grob (p, SCM_EOL);