From 53f40448901ffe0d953c81939d031c63cdf3779a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 26 Dec 2014 13:40:17 +0100
Subject: util/{ASCII,UriUtil}, ...: work around -Wtautological-pointer-compare
New in clang 3.6.
---
src/fs/Charset.cxx | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'src/fs/Charset.cxx')
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx
index dad5779f9..0b598ef46 100644
--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -79,7 +79,10 @@ GetFSCharset()
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
if (fs_charset.empty())
return std::string(path_fs);
@@ -109,7 +112,10 @@ PathToUTF8(const char *path_fs)
char *
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_charset.empty())
return g_strdup(path_utf8);
--
cgit v1.2.3