Revert "Issue 4550 (1/2) Avoid "using namespace std;" in included files"

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

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 5b7d2af11dac0363dfaa985cf6c1819920106c68..0a34d0504958c7fbe4ef8b05dae11b313d226321 100644 (file)
--- 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--2012 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
@@ -20,14 +20,13 @@
 #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,7 +38,7 @@ using namespace std;
 typedef size_t ssize;
 #define NPOS string::npos
 
-string to_string (string s);
+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);
@@ -53,10 +52,6 @@ __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);
+char *string_copy (const string &s);
 
 #endif /* STD_STRING_HH */