aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs/Traits.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 13:40:17 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 13:43:32 +0100
commit53f40448901ffe0d953c81939d031c63cdf3779a (patch)
tree9007d66ae6b1a9b58efbff6fa8db80df0a206b13 /src/fs/Traits.cxx
parenta5049136ffe020cd17109985e697fe2e8e1a18d5 (diff)
downloadmpd-53f40448901ffe0d953c81939d031c63cdf3779a.tar.gz
mpd-53f40448901ffe0d953c81939d031c63cdf3779a.tar.xz
mpd-53f40448901ffe0d953c81939d031c63cdf3779a.zip
util/{ASCII,UriUtil}, ...: work around -Wtautological-pointer-compare
New in clang 3.6.
Diffstat (limited to 'src/fs/Traits.cxx')
-rw-r--r--src/fs/Traits.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx
index 2c3ce075b..47cb5aee3 100644
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -25,7 +25,10 @@
const char *
PathTraits::GetBaseUTF8(const char *p)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(p != nullptr);
+#endif
const char *slash = strrchr(p, SEPARATOR_UTF8);
return slash != nullptr
@@ -36,7 +39,10 @@ PathTraits::GetBaseUTF8(const char *p)
std::string
PathTraits::GetParentUTF8(const char *p)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(p != nullptr);
+#endif
const char *slash = strrchr(p, SEPARATOR_UTF8);
return slash != nullptr