oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Charset: convert #ifdef to regular "if"

Browse Source
This commit is contained in:
Max Kellermann 2015-02-09 07:44:21 +01:00
parent 975e275030
commit 60e6d1d61b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fs/Charset.cxx
View File

@ -76,13 +76,15 @@ GetFSCharset()
static inline std::string && static inline std::string &&
FixSeparators(std::string &&s) FixSeparators(std::string &&s)
{ {
#ifdef WIN32
// For whatever reason GCC can't convert constexpr to value reference. // For whatever reason GCC can't convert constexpr to value reference.
// This leads to link errors when passing separators directly. // This leads to link errors when passing separators directly.
auto from = PathTraitsFS::SEPARATOR; auto from = PathTraitsFS::SEPARATOR;
auto to = PathTraitsUTF8::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); return std::move(s);
} }