From 502eb5d144b54eb9204918638daecea99132b65f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 26 Jan 2006 18:08:30 +0000 Subject: [PATCH] (slashify): use std strings. --- ChangeLog | 2 ++ flower/file-name.cc | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc1e4e602b..3c4f9c46c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-26 Han-Wen Nienhuys + * 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 9cd37c9a7b..54449f907e 100644 --- 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 -- 2.39.5