From 60e6d1d61b1c56d3a94fa73779f240b8d7d43a89 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 9 Feb 2015 07:44:21 +0100
Subject: fs/Charset: convert #ifdef to regular "if"
---
src/fs/Charset.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx
index 5532a2cb6..ae495b6ae 100644
--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -76,13 +76,15 @@ GetFSCharset()
static inline std::string &&
FixSeparators(std::string &&s)
{
-#ifdef WIN32
// For whatever reason GCC can't convert constexpr to value reference.
// This leads to link errors when passing separators directly.
auto from = PathTraitsFS::SEPARATOR;
auto to = PathTraitsUTF8::SEPARATOR;
- std::replace(s.begin(), s.end(), from, to);
-#endif
+
+ if (from != to)
+ /* convert backslash to slash on WIN32 */
+ std::replace(s.begin(), s.end(), from, to);
+
return std::move(s);
}
--
cgit v1.2.3