Issue 4550 (2/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 fc4a1d17452304f8ccd1aea733332418e2c24fd0..2e2908f7a2dc7ec4c9f96f39935cd247b1bef73d 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--2011 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,45 +19,38 @@
 
 #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 */