(slashify): use std strings.

diff --git a/ChangeLog b/ChangeLog
index cc1e4e602b21fd3cae919ccd3aea1cb2b4b45791..3c4f9c46c03d795ddefec971fd4f91135bc6cb22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * flower/file-name.cc (slashify): use std strings.
+
        * flower/string-convert.cc: remove publib.h
 
        * scm/define-markup-commands.scm (verbatim-file): new markup

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 9cd37c9a7bef7080f5ffc6f438d3e294a4f109bd..54449f907e3badb52d50d56a63cc50670838bcab 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -50,17 +50,15 @@ dos_to_posix (std::string file_name)
 }
 #endif /* __CYGWIN__ */
 
-#ifdef __MINGW32__
 /** Use slash as directory separator.  On Windows, they can pretty
     much be exchanged.  */
 static std::string
 slashify (std::string file_name)
 {
-  file_name.substitute ('\\', '/');
-  file_name.substitute ("//", "/");
+  replace_all (file_name, '\\', '/');
+  replace_all (file_name, std::String ("//"), "/");
   return file_name;
 }
-#endif /* __MINGW32__ */
 
 /* Join components to full file_name. */
 std::string