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

fs/Traits.hxx: simplify code

Browse Source 
- Move definition of SEPARATOR_UTF8 out of #ifdef
- Remove duplicated check in IsSeparatorUTF8
This commit is contained in:
Denis Krjuchkov
2013-12-03 11:48:45 +06:00
parent 07352e82f1
commit d744ea3fca
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fs/Traits.hxx
View File

@@ -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 {
} }
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