Remove exposed C++ namespace.

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

diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index f506a8f1ba2a11d2d21200b1d705ae114d959917..7e48760e77d9204ac34bb2626b835876ec96c487 100644 (file)
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
@@ -44,12 +44,12 @@ using namespace libtest;
 #include <string>
 #include <cerrno>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 #include <tests/libmemcached-1.0/parser.h>
 #include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 enum scanner_type_t
 {
@@ -85,7 +85,7 @@ struct scanner_variable_t {
 // Check and make sure the first host is what we expect it to be
 static test_return_t __check_host(memcached_st *memc, const scanner_string_st &hostname)
 {
-  memcached_server_instance_st instance=
+  const memcached_instance_st * instance=
     memcached_server_instance_by_position(memc, 0);
 
   test_true(instance);
@@ -617,7 +617,7 @@ test_return_t random_statement_build_test(memcached_st*)
 }
 
 static memcached_return_t dump_server_information(const memcached_st *,
-                                                  memcached_server_instance_st instance,
+                                                  const memcached_instance_st * instance,
                                                   void *)
 {
   if (strcmp(memcached_server_name(instance), "localhost")) 
@@ -667,7 +667,7 @@ struct socket_weight_t {
 };
 
 static memcached_return_t dump_socket_information(const memcached_st *,
-                                                  memcached_server_instance_st instance,
+                                                  const memcached_instance_st * instance,
                                                   void *context)
 {
   socket_weight_t *check= (socket_weight_t *)context;