aboutsummaryrefslogtreecommitdiffstats
path: root/src/tag
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/tag
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/tag')
-rw-r--r--src/tag/TagBuilder.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx
index 25e5cc24b..083b43d69 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/TagBuilder.cxx
@@ -77,7 +77,10 @@ TagBuilder::Commit()
inline void
TagBuilder::AddItemInternal(TagType type, const char *value, size_t length)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(value != nullptr);
+#endif
assert(length > 0);
char *p = FixTagString(value, length);
@@ -98,7 +101,10 @@ TagBuilder::AddItemInternal(TagType type, const char *value, size_t length)
void
TagBuilder::AddItem(TagType type, const char *value, size_t length)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(value != nullptr);
+#endif
if (length == 0 || ignore_tag_items[type])
return;
@@ -109,7 +115,10 @@ TagBuilder::AddItem(TagType type, const char *value, size_t length)
void
TagBuilder::AddItem(TagType type, const char *value)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(value != nullptr);
+#endif
AddItem(type, value, strlen(value));
}