X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=b930fd521a50e4eb2c93d69736591cac7a7b402e;hb=255d19c2edfe2ec4dc648b582a96e6fcb0039197;hp=77fbb2137489cb55ed16fe04a205200958a7a381;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 77fbb21374..b930fd521a 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -22,9 +22,6 @@
 #include "offset.hh"
 #include "warn.hh"
 
-using std::string;
-using std::vector;
-
 /*
   Return the 2-log, rounded down
 */
@@ -67,7 +64,7 @@ peak_around (Real epsilon, Real threshold, Real x)
 {
   if (x < 0)
     return 1.0;
-  return std::max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
 /*