Skip to content

M
mpd
Commit d744ea3f authored by Denis Krjuchkov's avatar Denis Krjuchkov
Browse files
Options

fs/Traits.hxx: simplify code

- Move definition of SEPARATOR_UTF8 out of #ifdef - Remove duplicated check in IsSeparatorUTF8
parent 07352e82
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/fs/Traits.hxx
View file @ d744ea3f
...@@ -41,12 +41,12 @@ struct PathTraits { ...@@ -41,12 +41,12 @@ struct PathTraits {
#ifdef WIN32 #ifdef WIN32
static constexpr value_type SEPARATOR_FS = '\\'; static constexpr value_type SEPARATOR_FS = '\\';
static constexpr char SEPARATOR_UTF8 = '/';
#else #else
static constexpr value_type SEPARATOR_FS = '/'; static constexpr value_type SEPARATOR_FS = '/';
static constexpr char SEPARATOR_UTF8 = '/';
#endif #endif
static constexpr char SEPARATOR_UTF8 = '/';
static constexpr bool IsSeparatorFS(value_type ch) { static constexpr bool IsSeparatorFS(value_type ch) {
return return
#ifdef WIN32 #ifdef WIN32
...@@ -56,11 +56,7 @@ struct PathTraits { ...@@ -56,11 +56,7 @@ struct PathTraits {
} }
static constexpr bool IsSeparatorUTF8(char ch) { static constexpr bool IsSeparatorUTF8(char ch) {
return return ch == SEPARATOR_UTF8;
#ifdef WIN32
ch == '/' ||
#endif
ch == SEPARATOR_UTF8;
} }
gcc_pure gcc_pure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment