/*
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
#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 (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 (unsigned);
-string to_string (bool b);
-string to_string (char const *format, ...)
+#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)));
-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);
+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 */