Release: bump Welcome versions.

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 1abd13646c26f4e36902befe001dd5ed0bdd65cf..536ced40e5b7fb75b88b34893da3064ff3faa8bd 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -20,6 +20,7 @@
 #include "rest-collision.hh"
 
 #include <cmath>                // ceil.
+using namespace std;
 
 #include "directional-element-interface.hh"
 #include "duration.hh"
@@ -37,8 +38,6 @@
 #include "warn.hh"
 #include "lily-imports.hh"
 
-using std::vector;
-
 MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, "");
 SCM
 Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
@@ -255,7 +254,7 @@ Rest_collision::calc_positioning_done (SCM smob)
                 notedim.unite (notes[i]->extent (common, Y_AXIS));
             }
 
-          Real y = dir * std::max (0.0,
+          Real y = dir * max (0.0,
                               -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist);
 
           // move discretely by half spaces.