X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-string.hh;h=8ae6dfa5af5cbbf8846ac019ca46103df3484c82;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=53b02c2cca5cfce6ea9c30b9aab11ce143b612ae;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 53b02c2cca..8ae6dfa5af 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,74 +1,52 @@
 /*
-  std-string.hh -- declare std::string
+  std-string.hh -- declare string
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef STD_STRING_HH
 #define STD_STRING_HH
-
-#if !STD_STRING
-
-/* Also declare string, in the wrong way.  */
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-
-#endif
-
-
+ 
 #include "compare.hh"
+#include "flower-proto.hh"
 
-#if STD_STRING
-#include <string>
+#if 0
+/*
+  leads to dubious crashes - libstdc++  bug?
+ */
+#ifndef NDEBUG
+#define _GLIBCXX_DEBUG 1
+#endif
 #endif
 
-#if STD_STRING
-
-namespace std {
-
-  typedef size_t ssize;
-#define NPOS std::string::npos
-
-}
-
-#else /* ! STD_STRING */
-
-namespace std {
-
-#define string String
-  using namespace std;
-  class String;
-  typedef int ssize;
-#define NPOS -1
-
-}
-
-#include "string.hh"
-
-#endif /* STD_STRING */
-
-namespace std {
+#include <string>
 
-  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 (I64, char const *format=0);
+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 const &find, string const &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 */