* configure.in (NCSB_DIR): fix --with-ncsb-dir option.

[lilypond.git] / flower / string-convert.cc

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index e6aacb7a45e12204db9771f9f15417d34a4aa6e1..7e771c8e73c7b510079ea68fe7679bd3bf5f524a 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -8,6 +8,7 @@
 
 #include <cstring>
 #include <cstdio>
+using namespace std;
 
 #include "libc-extension.hh"
 #include "rational.hh"
@@ -177,13 +178,13 @@ String_convert::unsigned2hex (unsigned u, int length_i, char fill_char)
 #endif
 
   str = to_string (fill_char, length_i - str.length ()) + str;
-  while ((str.length () > length_i) && (str[ 0 ] == 'f' ) )
+  while ((str.length () > length_i) && (str[ 0 ] == 'f'))
     str = str.cut_string (2, INT_MAX);
 
   return str;
 }
 
-String 
+String
 String_convert::int2hex (int i, int length_i, char fill_char)
 {
   return unsigned2hex ((unsigned)i, length_i, fill_char);
@@ -192,7 +193,7 @@ String_convert::int2hex (int i, int length_i, char fill_char)
 Byte
 String_convert::nibble2hex_byte (Byte byte)
 {
-  if ((byte & 0x0f) <= 9 )
+  if ((byte & 0x0f) <= 9)
     return (byte & 0x0f) + '0';
   else
     return (byte & 0x0f) - 10 + 'a';
@@ -285,7 +286,7 @@ String_convert::pointer_string (void const *l)
 String
 String_convert::precision_string (double x, int n)
 {
-  String format = "%." + to_string (0 >? n - 1) + "e";
+  String format = "%." + to_string (max (0, n - 1)) + "e";
   String str = double_string (abs (x), format.to_str0 ());
 
   int exp = str.right_string (3).to_int ();
@@ -305,7 +306,7 @@ String_convert::precision_string (double x, int n)
     str = "0." + to_string ('0', -dot) + str;
   else if (dot >= str.length ())
     str += to_string ('0', dot - str.length ());
-  else if (( dot > 0) && (dot < str.length ()))
+  else if ((dot > 0) && (dot < str.length ()))
     str = str.left_string (dot) + "." + str.cut_string (dot, INT_MAX);
   else
     assert (0);
@@ -343,5 +344,5 @@ String_convert::long_string (long l)
 String
 String_convert::pad_to (String s, int n)
 {
-  return s + to_string (' ' , (n - s.length ()) >? 0);
+  return s + to_string (' ', max (n - s.length (), 0));
 }