Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / allocators.cc

diff --git a/libmemcached/allocators.cc b/libmemcached/allocators.cc
index d18372b4ba6ca9793e1f60787487c36a80bfff7d..98c87591a53615e496babd67c4b605dd4e4449e6 100644 (file)
--- a/libmemcached/allocators.cc
+++ b/libmemcached/allocators.cc
@@ -60,7 +60,7 @@ void *_libmemcached_calloc(const memcached_st *self, size_t nelem, size_t size,
   if (self->allocators.malloc != _libmemcached_malloc)
   {
      void *ret = _libmemcached_malloc(self, nelem * size, context);
-     if (not ret)
+     if (ret == NULL)
      {
        memset(ret, 0, nelem * size);
      }