darwin: fix #90

[awesomized/libmemcached] / tests / libmemcached-1.0 / plus.cpp

diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp
index 68f1d7e01800893d010637a04ec9d922ef40bf78..5897dcb71338d6b81d9df67c5ea63181fda61814 100644 (file)
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 /*
   C++ interface test
@@ -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);