X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-string.hh;h=2e2908f7a2dc7ec4c9f96f39935cd247b1bef73d;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=4cff4e2e6045e7708a763a2005499deb4af74c39;hpb=852977de8121f26b97abe7e63bd9b1a233274730;p=lilypond.git

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 4cff4e2e60..2e2908f7a2 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,52 +1,56 @@
 /*
-  std-string.hh -- declare string
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2006--2007 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
- 
-#include "compare.hh"
+
 #include "flower-proto.hh"
 
 #if 0
 /*
   leads to dubious crashes - libstdc++  bug?
  */
-#ifndef NDEBUG
+#ifdef DEBUG
 #define _GLIBCXX_DEBUG 1
 #endif
 #endif
 
 #include <string>
 
-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 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);
-
+#define NPOS std::string::npos
+
+std::string to_string (const std::string&);
+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);
+std::string to_string (long unsigned);
+std::string to_string (I64, char const *format = 0);
+std::string to_string (unsigned);
+std::string to_string (bool b);
+std::string to_string (char const *format, ...)
+__attribute__ ((format (printf, 1, 2)));
+
+std::string &replace_all (std::string *str, std::string const &find, std::string const &replace);
+std::string &replace_all (std::string *str, char find, char replace);
+char *string_copy (const std::string &s);
 
 #endif /* STD_STRING_HH */