aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 14:28:01 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 14:34:03 +0100
commit95f84afd338a9333b2fcf05dc171ce1dad6fbe7c (patch)
treea97ed33aed26dc814f78ff31fab44cbe4d14848e /src/lib
parent9f7fd1fbfb0e351d42657b1094c34b0f2233ef6c (diff)
downloadmpd-95f84afd338a9333b2fcf05dc171ce1dad6fbe7c.tar.gz
mpd-95f84afd338a9333b2fcf05dc171ce1dad6fbe7c.tar.xz
mpd-95f84afd338a9333b2fcf05dc171ce1dad6fbe7c.zip
fs/Traits, ...: work around -Wtautological-pointer-compare
New in clang 3.6.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/icu/Collate.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx
index b8560a4d8..17b536b37 100644
--- a/src/lib/icu/Collate.cxx
+++ b/src/lib/icu/Collate.cxx
@@ -121,8 +121,11 @@ gcc_pure
int
IcuCollate(const char *a, const char *b)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(a != nullptr);
assert(b != nullptr);
+#endif
#ifdef HAVE_ICU
assert(collator != nullptr);
@@ -159,7 +162,10 @@ IcuCaseFold(const char *src)
{
#ifdef HAVE_ICU
assert(collator != nullptr);
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(src != nullptr);
+#endif
const auto u = UCharFromUTF8(src);
if (u.IsNull())