Imported Upstream version 2.14.2

[lilypond.git] / flower / include / string-convert.hh

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 2cd863f49582724e7ea0cb6db29ef714ce74b857..21ec7f189e2dcd7789623ae1f31df4b8af29c7d3 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -9,7 +9,6 @@
 #include <cstdarg>
 using namespace std;
 
-#include "std-string.hh"
 #include "flower-proto.hh"
 
 /** The functor string_convert handles all conversions to/from string
@@ -23,6 +22,7 @@ public:
   static string pad_to (string s, int length);
   static string bool_string (bool b);
   static string bin2dec (string bin_string);
+  static string bin2hex (Byte bin_char);
   static string bin2hex (string bin_string);
   static string dec2bin (string str);
   static int bin2int (string bin_string);
@@ -31,7 +31,7 @@ public:
   static int dec2int (string dec_string);
   static double dec2double (string dec_string);
   static string double_string (double f, char const *fmt = 0);
-  static string form_string (char const *format, ...);
+  static string form_string (char const *format, ...) __attribute__ ((format (printf, 1,2)));
   static string vform_string (char const *format, va_list args);
   static int hex2int (string str);
   static unsigned hex2unsigned (string str);
@@ -45,7 +45,7 @@ public:
   static string rational_string (Rational);
   static string pointer_string (void const *);
   static string precision_string (double x, int n);
-  static vector<string> split (string str, char c);
+  //  static vector<string> split (string str, char c);
   static string i64_string (I64, char const *fmt = 0);
   static string to_lower (string s);
   static string to_upper (string s);