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

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 4e338caec99c199e19a8b1dd4d34882bdeba1465..dbf2a2ef898e5ecabb7f575935fd72b65ece5620 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -23,7 +23,6 @@
 
 #include <cmath>
 #include <cctype>
-using namespace std;
 
 #include "line-interface.hh"
 #include "warn.hh"
@@ -170,9 +169,9 @@ Stencil
 Lookup::round_filled_box (Box b, Real blotdiameter)
 {
   Real width = b.x ().delta ();
-  blotdiameter = min (blotdiameter, width);
+  blotdiameter = std::min (blotdiameter, width);
   Real height = b.y ().delta ();
-  blotdiameter = min (blotdiameter, height);
+  blotdiameter = std::min (blotdiameter, height);
 
   if (blotdiameter < 0.0)
     {
@@ -589,7 +588,7 @@ Lookup::triangle (Interval iv, Real thick, Real protrude)
 {
   Box b;
   b[X_AXIS] = Interval (0, iv.length ());
-  b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
+  b[Y_AXIS] = Interval (std::min (0., protrude), std::max (0.0, protrude));
 
   vector<Offset> points;
   points.push_back (Offset (iv[LEFT], 0));