projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove custom version of memcached (no longer needed).
[awesomized/libmemcached]
/
libmemcached
/
namespace.cc
diff --git
a/libmemcached/namespace.cc
b/libmemcached/namespace.cc
index 8278dd56337606cfa8dad3d4a803bd62ecf626ca..6a9ec2439d5e279e1734ed0c0bc8056ca06c9547 100644
(file)
--- a/
libmemcached/namespace.cc
+++ b/
libmemcached/namespace.cc
@@
-36,10
+36,11
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
+#include <libmemcached/assert.hpp>
memcached_return_t memcached_set_namespace(memcached_st *self, const char *key, size_t key_length)
{
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)
{
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)
{
const char * memcached_get_namespace(memcached_st *self)
{
- if (not self->_namespace)
+ if (self->_namespace == NULL)
+ {
return NULL;
return NULL;
+ }
return memcached_array_string(self->_namespace);
}
return memcached_array_string(self->_namespace);
}