diff options
author | Max Kellermann <max@duempel.org> | 2014-12-26 14:26:31 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:28:52 +0100 |
commit | 940cab8620428f21e6d0c9f4b11893b1f44ce610 (patch) | |
tree | 9b4771f1fce4e0e95f1507f021aa7587b7ba366d /src/tag | |
parent | 5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff) | |
parent | 665031467a55a32be306191514ac81f73ac41de7 (diff) | |
download | mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.gz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.xz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.zip |
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to '')
-rw-r--r-- | src/tag/TagBuilder.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx index c9ebcd654..93518f6e9 100644 --- a/src/tag/TagBuilder.cxx +++ b/src/tag/TagBuilder.cxx @@ -182,7 +182,10 @@ TagBuilder::Complement(const Tag &other) 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); auto f = FixTagString(value, length); @@ -203,7 +206,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; @@ -214,7 +220,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)); } |