Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 2e06e1de4b99f61f3ffacb6bbaf6343156cc2609..bb5ed0dc54da0b6f79b430afb227b2bb35682ab7 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -29,8 +29,6 @@
 
 #include "translator.icc"
 
-using std::vector;
-
 class Cluster_spanner_engraver : public Engraver
 {
 
@@ -107,8 +105,8 @@ Cluster_spanner_engraver::process_music ()
 
           int p = (pit ? pit->steps () : 0) + c0;
 
-          pmax = std::max (pmax, p);
-          pmin = std::min (pmin, p);
+          pmax = max (pmax, p);
+          pmin = min (pmin, p);
         }
 
       beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());