diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
| commit | 412bedb697c66c809652510951e1ccdb5319d0bb (patch) | |
| tree | a9c94234d7078e7a1e694e65db70a65966ccb5ac /src/fs/Charset.cxx | |
| parent | d37811f177bb7e4c5dd6e3a18b3466ba831aa379 (diff) | |
| parent | 163597ef6939e4250afafe12f821aa732b1fc2b7 (diff) | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/fs/Charset.cxx')
| -rw-r--r-- | src/fs/Charset.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 453962c1f..4d562b59f 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -89,7 +89,10 @@ static inline void FixSeparators(std::string &s) std::string PathToUTF8(const char *path_fs) { +#if !CLANG_CHECK_VERSION(3,6) + /* disabled on clang due to -Wtautological-pointer-compare */ assert(path_fs != nullptr); +#endif #ifdef HAVE_FS_CHARSET if (fs_converter == nullptr) { @@ -111,7 +114,10 @@ PathToUTF8(const char *path_fs) std::string PathFromUTF8(const char *path_utf8) { +#if !CLANG_CHECK_VERSION(3,6) + /* disabled on clang due to -Wtautological-pointer-compare */ assert(path_utf8 != nullptr); +#endif if (fs_converter == nullptr) return path_utf8; |