X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-string.hh;h=5b7d2af11dac0363dfaa985cf6c1819920106c68;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=4cefb799534c19286ee40c6cd9f7e2f3b1c24f0d;hpb=bf898a6f737ebdd6a749ea0a14d1056a3566a10e;p=lilypond.git

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 4cefb79953..5b7d2af11d 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,66 +1,62 @@
 /*
-  std-string.hh -- declare Std_string
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef STD_STRING_HH
 #define STD_STRING_HH
 
-#if !STD_STRING
-
-#define Std_string String
-#define to_std_string to_string
-class String;
-typedef int ssize;
-#define NPOS -1
-
-#include "string.hh"
-
-#else
-
-#include <string>
-// #warning Using std::string
-using namespace std;
-typedef size_t ssize;
-
-#define NPOS std::string::npos
-
-namespace std {
+#include "compare.hh"
+#include "flower-proto.hh"
 
 #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;
+/*
+  leads to dubious crashes - libstdc++  bug?
+ */
+#ifndef NDEBUG
+#define _GLIBCXX_DEBUG 1
+#endif
 #endif
 
-  //operator Std_string (String const&);
-
-  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, ...);
+#include <string>
 
-#endif /* STD_STRING */
+using namespace std;
 
-  Std_string &replace_all (Std_string &str, Std_string find, Std_string replace);
-#if STD_STRING
-}
-#endif
-  
+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 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);
 
 #endif /* STD_STRING_HH */