*** empty log message ***

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

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index d2b2ffd1a3322b312a67630537f2c85603b6128d..6c83bc526fb923e473128e96d318f0fceb0660a4 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 std::string
 
   source file of the GNU LilyPond music typesetter
 
@@ -11,43 +11,61 @@
 
 #if !STD_STRING
 
-#define Std_string
-#define to_std_string to_string
-#include "string.hh"
+/* Also declare string, in the wrong way.  */
+#include <algorithm>
+#include <iostream>
+#include <sstream>
+
+#endif
+
+
 
-#else
+#include "compare.hh"
 
+#if STD_STRING
 #include <string>
-#warning Using std::string
+#endif
+
+#if STD_STRING
 
 namespace std {
 
-#if 0
-  class Std_string : public string
-  {
-  public:
-    Std_string ();
-    Std_string (char const*);
-    Std_string (Std_string const&, int pos, int n=npos);
-    ///Std_string (String const&, int pos, int n);
-    ////Std_string (String const &);
-    ////operator String ();
-  };
-#else  
-  typedef string Std_string;
-#endif
+  typedef size_t ssize;
+#define NPOS std::string::npos
+  // typedef string std::string;
+}
 
-  //operator Std_string (String const&);
+#else /* ! STD_STRING */
 
-  Std_string to_std_string (Std_string s);
-  Std_string to_std_string (char c, int n = 1);
-  Std_string to_std_string (int i, char const *format = 0);
-  Std_string to_std_string (double f, char const *format = 0);
-  Std_string to_std_string (long b);
-  Std_string to_std_string (bool b);
-  Std_string to_std_string (char const *format, ...);
+namespace std {
+
+#define string String
+  using namespace std;
+  class String;
+  typedef int ssize;
+#define NPOS -1
 }
 
+#include "string.hh"
+
 #endif /* STD_STRING */
 
+namespace std {
+
+  std::string to_string (std::string s);
+  std::string to_string (char c, int n = 1);
+  std::string to_string (int i, char const *format = 0);
+  std::string to_string (double f, char const *format = 0);
+  std::string to_string (long b);
+  std::string to_string (bool b);
+  std::string to_string (char const *format, ...);
+  
+  std::string &replace_all (std::string &str, std::string find, std::string replace);
+  std::string &replace_all (std::string &str, char find, char replace);
+  char *string_copy (std::string s);
+  
+  int string_compare (std::string const &, std::string const &);
+  INSTANTIATE_COMPARE (std::string const &, string_compare);
+}
+
 #endif /* STD_STRING_HH */