diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
| commit | 412bedb697c66c809652510951e1ccdb5319d0bb (patch) | |
| tree | a9c94234d7078e7a1e694e65db70a65966ccb5ac /src/fs/Traits.cxx | |
| parent | d37811f177bb7e4c5dd6e3a18b3466ba831aa379 (diff) | |
| parent | 163597ef6939e4250afafe12f821aa732b1fc2b7 (diff) | |
| download | mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.gz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.xz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/fs/Traits.cxx')
| -rw-r--r-- | src/fs/Traits.cxx | 6 |
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) |