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/input | |
| 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/input')
| -rw-r--r-- | src/input/InputStream.cxx | 3 | ||||
| -rw-r--r-- | src/input/plugins/MmsInputPlugin.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/input/InputStream.cxx b/src/input/InputStream.cxx index f5efe8ef1..44f726a62 100644 --- a/src/input/InputStream.cxx +++ b/src/input/InputStream.cxx @@ -122,7 +122,10 @@ InputStream::IsAvailable() size_t InputStream::LockRead(void *ptr, size_t _size, Error &error) { +#if !CLANG_CHECK_VERSION(3,6) + /* disabled on clang due to -Wtautological-pointer-compare */ assert(ptr != nullptr); +#endif assert(_size > 0); const ScopeLock protect(mutex); diff --git a/src/input/plugins/MmsInputPlugin.cxx b/src/input/plugins/MmsInputPlugin.cxx index df291bc84..d01cff3b3 100644 --- a/src/input/plugins/MmsInputPlugin.cxx +++ b/src/input/plugins/MmsInputPlugin.cxx @@ -43,7 +43,7 @@ protected: virtual size_t ThreadRead(void *ptr, size_t size, Error &error) override; - virtual void Close() { + void Close() override { mmsx_close(mms); } }; |