Imported Upstream version 2.16.0

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

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 21ec7f189e2dcd7789623ae1f31df4b8af29c7d3..148005672ec78698c41ba2bf856b41947e69e254 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -19,7 +19,7 @@ class String_convert
   static int hex2nibble (Byte byte);
   static Byte nibble2hex_byte (Byte byte);
 public:
-  static string pad_to (string s, int length);
+  static string pad_to (string s, size_t length);
   static string bool_string (bool b);
   static string bin2dec (string bin_string);
   static string bin2hex (Byte bin_char);
@@ -31,17 +31,18 @@ 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, ...) __attribute__ ((format (printf, 1,2)));
+  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);
   static string hex2bin (string str);
   static string int_string (int i, char const *fmt = 0);
   static string unsigned_string (unsigned);
+  static string unsigned_long_string (unsigned long);
   static string long_string (long);
-  static string int2hex (int i, int length_i, char ch);
-  static string unsigned2hex (unsigned u, ssize length, char ch);
-  static string int2dec (int i, int length_i, char ch);
+  static string int2hex (int i, size_t length_i, char ch);
+  static string unsigned2hex (unsigned u, size_t length, char ch);
+  static string int2dec (int i, size_t length_i, char ch);
   static string rational_string (Rational);
   static string pointer_string (void const *);
   static string precision_string (double x, int n);