X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fnamespace.cc;h=6a9ec2439d5e279e1734ed0c0bc8056ca06c9547;hb=7d698ad128550cb4d2e3a60c83533c4370efd106;hp=8278dd56337606cfa8dad3d4a803bd62ecf626ca;hpb=77eab04d2140f8e2bd904f7ac4a59b4eef54244f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/namespace.cc b/libmemcached/namespace.cc
index 8278dd56..6a9ec243 100644
--- a/libmemcached/namespace.cc
+++ b/libmemcached/namespace.cc
@@ -36,10 +36,11 @@
  */
 
 #include <libmemcached/common.h>
+#include <libmemcached/assert.hpp>
 
 memcached_return_t memcached_set_namespace(memcached_st *self, const char *key, size_t key_length)
 {
-  WATCHPOINT_ASSERT(self);
+  assert_msg(self, "A NULL memcached_st was used");
 
   if (key and key_length == 0)
   { 
@@ -86,8 +87,10 @@ memcached_return_t memcached_set_namespace(memcached_st *self, const char *key,
 
 const char * memcached_get_namespace(memcached_st *self)
 {
-  if (not self->_namespace)
+  if (self->_namespace == NULL)
+  {
     return NULL;
+  }
 
   return memcached_array_string(self->_namespace);
 }