From: Dan Eble <nine.fierce.ballads@gmail.com>
Date: Sat, 8 Aug 2015 22:22:54 +0000 (-0400)
Subject: Issue 4546: don't redefine comparison operators for std::string
X-Git-Tag: release/2.19.26-1~46
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=b95878a57a7894ed6eaf7f615fe02ea1cb2165d0

Issue 4546: don't redefine comparison operators for std::string
---

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 253e09f4cc..f829e531ec 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -20,6 +20,7 @@
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
+#include "compare.hh"
 #include "flower-proto.hh"
 #include "std-string.hh"
 #include <limits.h>
diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 651f3403a1..0a34d05049 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -20,7 +20,6 @@
 #ifndef STD_STRING_HH
 #define STD_STRING_HH
 
-#include "compare.hh"
 #include "flower-proto.hh"
 
 #if 0
@@ -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 */
diff --git a/flower/std-string.cc b/flower/std-string.cc
index 347f0f3688..9666b9e9c3 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -116,12 +116,6 @@ string_copy (const string &s)
   return dest;
 }
 
-int
-string_compare (string const &a, string const &b)
-{
-  return a.compare (b);
-}
-
 #include "std-vector.hh"
 
 vector<string>