Merge in basic unittest for test framework.

[m6w6/libmemcached] / libmemcached / callback.cc

diff --git a/libmemcached/callback.cc b/libmemcached/callback.cc
index 3625992ef8734dfafa5687261c6479cc54928051..473978634ce820bdafe3937f54d1ebc3caa0e33f 100644 (file)
--- a/libmemcached/callback.cc
+++ b/libmemcached/callback.cc
@@ -20,7 +20,7 @@
 
 memcached_return_t memcached_callback_set(memcached_st *ptr,
                                           const memcached_callback_t flag,
-                                          void *data)
+                                          const void *data)
 {
   switch (flag)
   {
@@ -30,7 +30,7 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
     }
   case MEMCACHED_CALLBACK_USER_DATA:
     {
-      ptr->user_data= data;
+      ptr->user_data= const_cast<void *>(data);
       break;
     }
   case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
@@ -97,10 +97,10 @@ void *memcached_callback_get(memcached_st *ptr,
   {
   case MEMCACHED_CALLBACK_PREFIX_KEY:
     {
-      if (ptr->prefix_key)
+      if (ptr->_namespace)
       {
         *error= MEMCACHED_SUCCESS;
-        return (void *)memcached_array_string(ptr->prefix_key);
+        return (void *)memcached_array_string(ptr->_namespace);
       }
       else
       {