Merge branch 'v0.18.x' into v0.19.x

This commit is contained in:
Max Kellermann
2014-12-26 14:26:31 +01:00
19 changed files with 114 additions and 51 deletions

View File

@@ -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);