(descend-to-context, context-spec-music): optional arguments id mods

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

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