From 48ca3ba1f7e7de37716da3b6dfa2b223114c0cad Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 23 Jan 2006 21:12:19 +0000
Subject: [PATCH] std:: macramee

---
 flower/include/std-string.hh | 8 +++++---
 flower/std-string.cc         | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

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
-- 
2.11.4.GIT