aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 14:40:32 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 14:40:32 +0100
commit412bedb697c66c809652510951e1ccdb5319d0bb (patch)
treea9c94234d7078e7a1e694e65db70a65966ccb5ac /src/input
parentd37811f177bb7e4c5dd6e3a18b3466ba831aa379 (diff)
parent163597ef6939e4250afafe12f821aa732b1fc2b7 (diff)
downloadmpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.gz
mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.xz
mpd-412bedb697c66c809652510951e1ccdb5319d0bb.zip
Merge branch 'v0.19.x'
Diffstat (limited to '')
-rw-r--r--src/input/InputStream.cxx3
-rw-r--r--src/input/plugins/MmsInputPlugin.cxx2
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);
}
};