X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstring-convert.cc;h=e3e8bc824da7e3cc4b93937b093d07f04672d603;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=cbbde1e9d677d75aab6223a095ee0d5a2d77c0c7;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index cbbde1e9d6..e3e8bc824d 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -8,13 +8,12 @@
 
 #include <cstring>
 #include <cstdio>
+using namespace std;
 
 #include "libc-extension.hh"
 #include "rational.hh"
 #include "std-vector.hh"
 
-using std::string;
-
 /**
    A safe length for stringconversion buffers.
 
@@ -298,7 +297,7 @@ String_convert::pointer_string (void const *l)
 string
 String_convert::precision_string (double x, int n)
 {
-  string format = "%." + ::to_string (std::max (0, n - 1)) + "e";
+  string format = "%." + ::to_string (max (0, n - 1)) + "e";
   string str = double_string (abs (x), format.c_str ());
 
   int exp = dec2int (str.substr (str.length () - 3));
@@ -353,7 +352,7 @@ String_convert::unsigned_long_string (unsigned long ul)
 string
 String_convert::pad_to (const string &s, size_t n)
 {
-  return s + string (std::max (int (n - s.length ()), 0), ' ');
+  return s + string (max (int (n - s.length ()), 0), ' ');
 }
 
 string