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 789265818bf76f63637c3f84288c8b8ff48d6d64..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,16 +43,14 @@ 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 *ptr,
-                                         const memcached_server_st *server,
+memcached_return_t server_print_callback(const memcached_st*,
+                                         const memcached_instance_st * server,
                                          void *context)
 {
-  (void)ptr;
-
   if (context)
   {
     std::cerr << memcached_server_name(server) << ":" << memcached_server_port(server) << std::endl;
@@ -60,3 +58,25 @@ memcached_return_t server_print_callback(const memcached_st *ptr,
 
   return MEMCACHED_SUCCESS;
 }
+
+memcached_return_t server_print_version_callback(const memcached_st *,
+                                                 const memcached_instance_st * server,
+                                                 void *)
+{
+  std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " " 
+    << 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()";
+}