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/input | |
| parent | 5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff) | |
| parent | 665031467a55a32be306191514ac81f73ac41de7 (diff) | |
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/InputStream.cxx | 3 |
1 files changed, 3 insertions, 0 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); |