*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 805ea68fcbc631de7b1d6561449374852df84aed..0e4e425b7c1d99ed10de0cf468f6d8a1421a61a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Fix -DSTRING_UTILS_INLINED.
+
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/relocate.cc (setup_paths): mingw uses std string too.

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 54449f907e3badb52d50d56a63cc50670838bcab..2302baa46b6a0647f72be83f4a4e44a043d26f7f 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -56,7 +56,7 @@ static std::string
 slashify (std::string file_name)
 {
   replace_all (file_name, '\\', '/');
-  replace_all (file_name, std::String ("//"), "/");
+  replace_all (file_name, std::string ("//"), "/");
   return file_name;
 }
 

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 6c83bc526fb923e473128e96d318f0fceb0660a4..c07ffdfac181c69552f27a32d542924e6d7fa898 100644 (file)
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -19,7 +19,6 @@
 #endif
 
 
-
 #include "compare.hh"
 
 #if STD_STRING
@@ -32,7 +31,7 @@ namespace std {
 
   typedef size_t ssize;
 #define NPOS std::string::npos
-  // typedef string std::string;
+
 }
 
 #else /* ! STD_STRING */
@@ -44,6 +43,7 @@ namespace std {
   class String;
   typedef int ssize;
 #define NPOS -1
+
 }
 
 #include "string.hh"
@@ -52,20 +52,22 @@ namespace std {
 
 namespace std {
 
-  std::string to_string (std::string s);
-  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 b);
-  std::string to_string (bool b);
-  std::string to_string (char const *format, ...);
+  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 b);
+  string to_string (bool b);
+  string to_string (char const *format, ...);
   
-  std::string &replace_all (std::string &str, std::string find, std::string replace);
-  std::string &replace_all (std::string &str, char find, char replace);
-  char *string_copy (std::string s);
+  string &replace_all (string &str, string find, string replace);
+  string &replace_all (string &str, char find, char replace);
+  char *string_copy (string s);
   
-  int string_compare (std::string const &, std::string const &);
-  INSTANTIATE_COMPARE (std::string const &, string_compare);
+  int string_compare (string const &, string const &);
+
+  INSTANTIATE_COMPARE (string const &, string_compare);
 }
 
+
 #endif /* STD_STRING_HH */

diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh
index 11dbe28189d32c657c154bd5d8a0723497889a79..ddae249b1e8b455d012a8baf97d9fed76cd6fd94 100644 (file)
--- a/flower/include/string-data.hh
+++ b/flower/include/string-data.hh
@@ -91,7 +91,6 @@ class String_data
 #define INLINE inline
 #endif
 #include "string-data.icc"
-
 #endif
 
 #endif // STRING_DATA_HH

diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index 078e5724b2408d6caf313e3d20dd893dd1c46eee..d3c5f591a2eecabc983014ce4ac5f3033679a0ef 100644 (file)
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -11,7 +11,6 @@
 
 #include "string-data.hh"
 
-//#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <memory>

diff --git a/flower/include/string.hh b/flower/include/string.hh
index 7dd9932fe44e2599a64e3a43392ac9bdc384d5b1..2673c8c074f66da01ed44fa53169bf6b17810b3c 100644 (file)
--- a/flower/include/string.hh
+++ b/flower/include/string.hh
@@ -118,14 +118,6 @@ private:
   String substitute (char find, char replace);
 };
 
-#ifdef STRING_UTILS_INLINED
-#ifndef INLINE
-#define INLINE inline
-#endif
-#include "string.icc"
-/* we should be resetting INLINE. oh well. */
-#endif
-
 // because char const* also has an operator ==, this is for safety:
 bool operator == (String s1, char const *s2);
 bool operator == (char const *s1, String s2);
@@ -139,11 +131,12 @@ ostream &operator << (ostream &os, String d);
 
 }
 
-/*
-  technically incorrect, but lets keep it here: this is a
-  catch all place for this stuff.
-*/
-#include "international.hh"
-
+#ifdef STRING_UTILS_INLINED
+#ifndef INLINE
+#define INLINE inline
+#endif
+#include "string.icc"
+/* we should be resetting INLINE. oh well. */
+#endif
 
 #endif /* STRING_HH */

diff --git a/flower/include/string.icc b/flower/include/string.icc
index 5f8a39a495e1f5258ffbefe5198a5b71341365c5..765297af6a3485cf9ed89ea9cafbf968fb726167 100644 (file)
--- a/flower/include/string.icc
+++ b/flower/include/string.icc
@@ -11,6 +11,9 @@
 
 namespace std {
 
+  bool operator == (String const&, String const&);
+  bool operator != (String const&, String const&);
+  
 INLINE
 char const *
 String::c_str () const

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index 013413619232d2bafe6f25c06ad46e2dd2b1b72b..74b5630d614ecec2b42ced290763827ea868b681 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -15,9 +15,7 @@
 #define memmove mymemmove
 #endif
 
-#ifdef STRING_UTILS_INLINED
-#undef STRING_UTILS_INLINED
-#endif
+#ifndef STRING_UTILS_INLINED
 
 #ifdef INLINE
 #undef INLINE
@@ -48,4 +46,6 @@ mymemmove (void *dest, void const *src, size_t n)
 }
 #endif
 
+#endif /* STRING_UTILS_INLINED */
+
 #endif /* !STD_STRING */