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 cc0de9fae8254585e5f74f3862f32956d12b8953..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--2014 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
@@ -55,8 +54,4 @@ 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);
 
-int string_compare (string const &, string const &);
-
-INSTANTIATE_COMPARE (string const &, string_compare);
-
 #endif /* STD_STRING_HH */