Remove exposed C++ namespace.

[awesomized/libmemcached] / tests / libmemcached-1.0 / debug.cc

diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc
index 52170b9afc13619fc8d4f5acfbca4c1a975abd4c..83241f439229897f869a198fdaf0b5e7a8f2383a 100644 (file)
--- a/tests/libmemcached-1.0/debug.cc
+++ b/tests/libmemcached-1.0/debug.cc
@@ -35,18 +35,18 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <climits>
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include <tests/debug.h>
 #include <tests/print.h>
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 /* Dump each server's keys */
 static memcached_return_t print_keys_callback(const memcached_st *,
@@ -62,12 +62,12 @@ static memcached_return_t print_keys_callback(const memcached_st *,
 }
 
 static memcached_return_t server_wrapper_for_dump_callback(const memcached_st *,
-                                                           memcached_server_instance_st server,
+                                                           const memcached_instance_st * server,
                                                            void *)
 {
   memcached_st *memc= memcached_create(NULL);
 
-  if (server->type == MEMCACHED_CONNECTION_UNIX_SOCKET)
+  if (strcmp(memcached_server_type(server), "SOCKET") == 0)
   {
     if (memcached_failed(memcached_server_add_unix_socket(memc, memcached_server_name(server))))
     {
@@ -111,7 +111,7 @@ test_return_t confirm_keys_exist(memcached_st *memc, const char * const *keys, c
                                0, &rc);
     if (require_all)
     {
-      test_true_got(value, keys[x]);
+      test_true(value);
       if (key_matches_value)
       {
         test_strcmp(keys[x], value);
@@ -119,7 +119,7 @@ test_return_t confirm_keys_exist(memcached_st *memc, const char * const *keys, c
     }
     else if (memcached_success(rc))
     {
-      test_warn_hint(value, keys[x]);
+      test_warn(value, "get() did not return a value");
       if (value and key_matches_value)
       {
         test_strcmp(keys[x], value);