X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-string.hh;h=0a34d0504958c7fbe4ef8b05dae11b313d226321;hb=530857ca80db51aad52eb1c92ad5f23bfdcfdd4a;hp=3c95b2ef7f06baf69fe567b0cc56aba6087307dc;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 3c95b2ef7f..0a34d05049 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2006--2015 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
@@ -19,15 +19,14 @@
 
 #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
@@ -39,25 +38,20 @@ 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 (const string&);
+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 (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);
+__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 (const string &s);
 
 #endif /* STD_STRING_HH */