Merge in additional test for increment with namespace key.

[awesomized/libmemcached] / libmemcached / memcached.cc

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index f2e8993b5f57200b25372a416890eb34af35fd4b..f93f74b41169be93c343b694b4d9494c6121648b 100644 (file)
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -36,6 +36,8 @@
  */
 
 #include <libmemcached/common.h>
+
+#include <libmemcached/options.hpp>
 #include <libmemcached/virtual_bucket.h>
 
 #if 0
@@ -238,7 +240,7 @@ memcached_st *memcached(const char *string, size_t length)
 
   if (memcached_success(rc) and memcached_parse_filename(self))
   {
-    rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+    rc= memcached_parse_configure_file(*self, memcached_parse_filename(self), memcached_parse_filename_length(self));
   }
     
   if (memcached_failed(rc))
@@ -266,7 +268,7 @@ memcached_return_t memcached_reset(memcached_st *ptr)
 
   if (ptr->configure.filename)
   {
-    return memcached_parse_configure_file(ptr, memcached_param_array(ptr->configure.filename));
+    return memcached_parse_configure_file(*ptr, memcached_param_array(ptr->configure.filename));
   }
 
   return MEMCACHED_SUCCESS;
@@ -311,9 +313,8 @@ void memcached_free(memcached_st *ptr)
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 {
   memcached_return_t rc= MEMCACHED_SUCCESS;
-  memcached_st *new_clone;
 
-  if (source == NULL)
+  if (not source)
     return memcached_create(clone);
 
   if (clone && memcached_is_allocated(clone))
@@ -321,9 +322,9 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
     return NULL;
   }
 
-  new_clone= memcached_create(clone);
+  memcached_st *new_clone= memcached_create(clone);
 
-  if (new_clone == NULL)
+  if (not new_clone)
     return NULL;
 
   new_clone->flags= source->flags;