X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fplus.cpp;h=b0f92f6ecb2a459c353b0bc7399d9cfb9670cfeb;hb=d71edecebf48c345537cdb6f72e3afefde0e708f;hp=68f1d7e01800893d010637a04ec9d922ef40bf78;hpb=facfe08e21d2c3135c508ff098ff603ddaacef3e;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp
index 68f1d7e0..b0f92f6e 100644
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -35,13 +35,13 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 /*
   C++ interface test
 */
-#include <libmemcached-1.0/memcached.hpp>
-#include <libtest/test.hpp>
+#include "libmemcached-1.0/memcached.hpp"
+#include "libtest/test.hpp"
 
 #include <cstdio>
 #include <cstdlib>
@@ -181,6 +181,13 @@ static test_return_t mget_test(memcached_st *original)
   vector<char> return_value;
 
   /* We need to empty the server before we continue the test */
+  bool flush_res= memc.flush();
+  if (flush_res == false)
+  {
+    std::string error_string;
+    ASSERT_TRUE(memc.error(error_string));
+    Error << error_string;
+  }
   test_true(memc.flush());
 
   test_true(memc.mget(keys));
@@ -218,7 +225,7 @@ static test_return_t lp_1010899_with_args_TEST(memcached_st *original)
 {
   // Check to see everything is setup internally even when a host is specified
   // on creation.
-  memcached_server_instance_st instance= memcached_server_instance_by_position(original, 0);
+  const memcached_instance_st* instance= memcached_server_instance_by_position(original, 0);
   Memcache memc(memcached_server_name(instance), memcached_server_port(instance));
 
   test_false(memc.increment(__func__, 0, NULL));
@@ -322,7 +329,7 @@ collection_st collection[] ={
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
 #include "tests/libmemcached_world.h"
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);