aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Krjuchkov <denis@crazydev.net>2013-12-03 11:48:45 +0600
committerDenis Krjuchkov <denis@crazydev.net>2013-12-03 11:48:45 +0600
commitd744ea3fca26d2b734cf270a89110ff1fdd84398 (patch)
treea7c31eca94bea87d1d6fdd6ff5f388aa72f95834
parent07352e82f1f09ecde93c85621a4e6f57500a6fcb (diff)
downloadmpd-d744ea3fca26d2b734cf270a89110ff1fdd84398.tar.gz
mpd-d744ea3fca26d2b734cf270a89110ff1fdd84398.tar.xz
mpd-d744ea3fca26d2b734cf270a89110ff1fdd84398.zip
fs/Traits.hxx: simplify code
- Move definition of SEPARATOR_UTF8 out of #ifdef - Remove duplicated check in IsSeparatorUTF8
-rw-r--r--src/fs/Traits.hxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
index cdbe2082a..6b46f824e 100644
--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -41,12 +41,12 @@ struct PathTraits {
#ifdef WIN32
static constexpr value_type SEPARATOR_FS = '\\';
- static constexpr char SEPARATOR_UTF8 = '/';
#else
static constexpr value_type SEPARATOR_FS = '/';
- static constexpr char SEPARATOR_UTF8 = '/';
#endif
+ static constexpr char SEPARATOR_UTF8 = '/';
+
static constexpr bool IsSeparatorFS(value_type ch) {
return
#ifdef WIN32
@@ -56,11 +56,7 @@ struct PathTraits {
}
static constexpr bool IsSeparatorUTF8(char ch) {
- return
-#ifdef WIN32
- ch == '/' ||
-#endif
- ch == SEPARATOR_UTF8;
+ return ch == SEPARATOR_UTF8;
}
gcc_pure