From: janneke <janneke>
Date: Mon, 23 Jan 2006 21:12:19 +0000 (+0000)
Subject: std:: macramee
X-Git-Tag: release/2.7.38^2~293
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=141696c6286f80603ffaed77d549fc75d46df25e;p=lilypond.git

std:: macramee
---

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 1a505cc79a..d623145479 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -47,11 +47,13 @@ namespace std {
   Std_string to_std_string (long b);
   Std_string to_std_string (bool b);
   Std_string to_std_string (char const *format, ...);
-}
 
-}
 #endif /* STD_STRING */
+
+  Std_string &replace_all (Std_string &str, Std_string find, Std_string replace);
+#if STD_STRING
+}
+#endif
   
-Std_string &replace_all (Std_string &str, Std_string find, Std_string replace);
 
 #endif /* STD_STRING_HH */
diff --git a/flower/std-string.cc b/flower/std-string.cc
index e9cd0d9e5c..62edc829be 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -19,7 +19,6 @@ namespace std {
        n=1.  */
     return Std_string (n, c);
   }
-}
 
 #define FIND_FAILED string::npos
 #define SIZE_T size_t
@@ -40,3 +39,6 @@ replace_all (Std_string &str, Std_string find, Std_string replace)
   return str;
 }
 
+#if STD_STRING
+}
+#endif