* flower/include/std-vector.hh

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

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 7f36355fa883c269ca936ee91cb98d4e4f7e01ff..eda9aa9012eeae66c645ab4d43323015f74ff96e 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -6,14 +6,13 @@
 
 #include "string-convert.hh"
 
-#include <publib.h>
 #include <cstring>
 #include <cstdio>
 using namespace std;
 
 #include "libc-extension.hh"
 #include "rational.hh"
-#include "array.hh"
+#include "std-vector.hh"
 
 /**
    A safe length for stringconversion buffers.
@@ -319,22 +318,22 @@ String_convert::precision_string (double x, int n)
   return (sign (x) > 0 ? str : "-" + str);
 }
 
-Array<std::string>
+std::vector<std::string>
 String_convert::split (std::string str, char c)
 {
-  Array<std::string> a;
+  std::vector<std::string> a;
   ssize i = str.find (c);
   while (i != NPOS)
     {
       std::string s = str.substr (0, i);
-      a.push (s);
+      a.push_back (s);
       while (str[++i] == c)
        ;
       str = str.substr (i);
       i = str.find (c);
     }
   if (str.length ())
-    a.push (str);
+    a.push_back (str);
   return a;
 }
 
@@ -346,6 +345,14 @@ String_convert::long_string (long l)
   return s;
 }
 
+std::string
+String_convert::unsigned_string (unsigned u)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%u", u);
+  return s;
+}
+
 std::string
 String_convert::pad_to (std::string s, int n)
 {