diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/ZHandle.cc | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -102,7 +102,7 @@ ifeq ($(SYSTEM),Linux) STRIP = strip --strip-unneeded endif -CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) -fexceptions -imacros $(CONFIG_H) +CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) -fexceptions -imacros $(CONFIG_H) -std=gnu++0x CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) CXXFLAGS += -Wno-deprecated diff --git a/src/ZHandle.cc b/src/ZHandle.cc index 0a43b05..7ab0133 100644 --- a/src/ZHandle.cc +++ b/src/ZHandle.cc @@ -79,7 +79,7 @@ ssize_t Balau::ZStream::read(void * buf, size_t count) throw (GeneralException) if (r <= 0) return readTotal; } - Task::yield(NULL); + Task::yield(nullptr); int r = inflate(&m_zin, Z_SYNC_FLUSH); size_t didRead = count - m_zin.avail_out; readTotal += didRead; @@ -108,7 +108,7 @@ ssize_t Balau::ZStream::write(const void * buf, size_t count) throw (GeneralExce m_zout.avail_out = BLOCK_SIZE; int r = deflate(&m_zout, Z_NO_FLUSH); EAssert(r == Z_OK, "deflate() didn't return Z_OK but %i", r); - Task::yield(NULL); + Task::yield(nullptr); size_t compressed = BLOCK_SIZE - m_zout.avail_out; if (compressed) { size_t w = m_h->forceWrite(obuf, compressed); |