X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Freplication.cc;h=a760060ee5b040b55e150a8d9f0d68bfd273e085;hb=52f96be72d2f18994d6133c4410c263133270f0e;hp=198b83cccdbbf7a32ccab4fb1f77e6a764c5ea9c;hpb=cc47230b8dfe0bcd31d4f45ca84d2dd35ae360f0;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/replication.cc b/tests/libmemcached-1.0/replication.cc
index 198b83cc..a760060e 100644
--- a/tests/libmemcached-1.0/replication.cc
+++ b/tests/libmemcached-1.0/replication.cc
@@ -35,15 +35,17 @@
  *
  */
 
-#include <config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/server_instance.h>
-#include <tests/replication.h>
-#include <tests/debug.h>
+#include "libmemcached-1.0/memcached.h"
+
+#include "libmemcached/server_instance.h"
+
+#include "tests/replication.h"
+#include "tests/debug.h"
 
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
 
@@ -111,7 +113,7 @@ test_return_t replication_set_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 test_return_t replication_get_test(memcached_st *memc)
 {
@@ -124,7 +126,7 @@ test_return_t replication_get_test(memcached_st *memc)
   for (uint32_t host= 0; host < memcached_server_count(memc); ++host)
   {
     memcached_st *memc_clone= memcached_clone(NULL, memc);
-    org::libmemcached::Instance* instance= (org::libmemcached::Instance*)memcached_server_instance_by_position(memc_clone, host);
+    memcached_instance_st* instance= (memcached_instance_st*)memcached_server_instance_by_position(memc_clone, host);
 
     instance->port(0);
 
@@ -186,7 +188,7 @@ test_return_t replication_mget_test(memcached_st *memc)
   for (uint32_t host= 0; host < memcached_server_count(memc_clone); host++)
   {
     memcached_st *new_clone= memcached_clone(NULL, memc);
-    memcached_server_instance_st instance= memcached_server_instance_by_position(new_clone, host);
+    const memcached_instance_st * instance= memcached_server_instance_by_position(new_clone, host);
     ((memcached_server_write_instance_st)instance)->port(0);
 
     for (int x= 'a'; x <= 'z'; ++x)