Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 1cae94727bb06bfb0d67c72f5e8cf69fb4925c79..bc2fd61ee5f75bd90ccbd02692b7514aa72ac006 100644 (file)
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,5 +1,5 @@
 /*
-  std-string.hh -- declare std::string
+  std-string.hh -- declare string
 
   source file of the GNU LilyPond music typesetter
 
@@ -13,28 +13,29 @@
 
 #include <string>
 
-namespace std {
-
-  typedef size_t ssize;
-#define NPOS std::string::npos
-
-  string to_string (string s);
-  string to_string (char c, int n = 1);
-  string to_string (int i, char const *format = 0);
-  string to_string (double f, char const *format = 0);
-  string to_string (long);
-  string to_string (unsigned);
-  string to_string (bool b);
-  string to_string (char const *format, ...);
+using namespace std;
+
+typedef size_t ssize;
+#define NPOS string::npos
+
+string to_string (string s);
+string to_string (char c, int n=1);
+string to_string (int i, char const *format=0);
+string to_string (double f, char const *format=0);
+string to_string (long);
+string to_string (long unsigned);
+string to_string (unsigned);
+string to_string (bool b);
+string to_string (char const *format, ...)
+  __attribute__ ((format (printf, 1, 2)));
   
-  string &replace_all (string &str, string find, string replace);
-  string &replace_all (string &str, char find, char replace);
-  char *string_copy (string s);
-  
-  int string_compare (string const &, string const &);
+string &replace_all (string &str, string find, string replace);
+string &replace_all (string &str, char find, char replace);
+char *string_copy (string s);
+
+int string_compare (string const &, string const &);
 
-  INSTANTIATE_COMPARE (string const &, string_compare);
-}
+INSTANTIATE_COMPARE (string const &, string_compare);
 
 
 #endif /* STD_STRING_HH */