aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs/Traits.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 14:26:31 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 14:28:52 +0100
commit940cab8620428f21e6d0c9f4b11893b1f44ce610 (patch)
tree9b4771f1fce4e0e95f1507f021aa7587b7ba366d /src/fs/Traits.cxx
parent5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff)
parent665031467a55a32be306191514ac81f73ac41de7 (diff)
downloadmpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.gz
mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.xz
mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.zip
Merge branch 'v0.18.x' into v0.19.x
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 d62987087..166b31f4e 100644
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -52,7 +52,10 @@ template<typename Traits>
typename Traits::const_pointer
GetBasePathImpl(typename Traits::const_pointer p)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(p != nullptr);
+#endif
typename Traits::const_pointer sep = Traits::FindLastSeparator(p);
return sep != nullptr
@@ -64,7 +67,10 @@ template<typename Traits>
typename Traits::string
GetParentPathImpl(typename Traits::const_pointer p)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(p != nullptr);
+#endif
typename Traits::const_pointer sep = Traits::FindLastSeparator(p);
if (sep == nullptr)