Remove exposed C++ namespace.

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

diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc
index 13c4e1d0268b7b54db9577d8b12ec2dd84b7ae1e..00222de38f38820303fc45ac9ebfee818bab1c7f 100644 (file)
--- a/tests/libmemcached-1.0/print.cc
+++ b/tests/libmemcached-1.0/print.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
@@ -43,12 +43,12 @@ using namespace libtest;
 
 #include <iostream>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "tests/print.h"
 
 memcached_return_t server_print_callback(const memcached_st*,
-                                         const memcached_server_st *server,
+                                         const memcached_instance_st * server,
                                          void *context)
 {
   if (context)
@@ -59,25 +59,24 @@ memcached_return_t server_print_callback(const memcached_st*,
   return MEMCACHED_SUCCESS;
 }
 
-const char * print_version(memcached_st *memc)
-{
-  memcached_server_fn callbacks[1];
-  callbacks[0]= server_print_version_callback;
-  memcached_server_cursor(memc, callbacks, NULL,  1);
-
-  return "print_version()";
-}
-
-
 memcached_return_t server_print_version_callback(const memcached_st *,
-                                                 const memcached_server_st *server,
+                                                 const memcached_instance_st * server,
                                                  void *)
 {
   std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " " 
-    << int(server->major_version) << "."
-    << int(server->minor_version) << "."
-    << int(server->micro_version)
+    << int(memcached_server_major_version(server)) << "."
+    << int(memcached_server_minor_version(server)) << "."
+    << int(memcached_server_micro_version(server))
     << std::endl;
 
   return MEMCACHED_SUCCESS;
 }
+
+const char * print_version(memcached_st *memc)
+{
+  memcached_server_fn callbacks[1];
+  callbacks[0]= server_print_version_callback;
+  memcached_server_cursor(memc, callbacks, NULL,  1);
+
+  return "print_version()";
+}