X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=ec29b159f9ae5392abee9c02713ae4b88cc3ba23;hb=ccb1b4c4c320b20b045de17719dd51a3fdec8d2c;hp=2e5ea513545188e51e264144c4d8ec70b35e2cce;hpb=5ab3aecd63a2276c78f188e7c9f55918fb8fed6c;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 2e5ea513..ec29b159 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -15,10 +15,10 @@
 
 #include "test.h"
 
-uint8_t basic_test(memcached_st *memc)
+extern "C" test_return basic_test(memcached_st *memc)
 {
-  Memcached foo;
-  char *value_set= "This is some data";
+  Memcached foo(memc);
+  const char *value_set= "This is some data";
   char *value;
   size_t value_length;
 
@@ -27,14 +27,15 @@ uint8_t basic_test(memcached_st *memc)
 
   assert((memcmp(value, value_set, value_length) == 0));
 
-  return 0;
+  return TEST_SUCCESS;
 }
-uint8_t increment_test(memcached_st *memc)
+
+extern "C" uint8_t increment_test(memcached_st *memc)
 {
-  Memcached mcach;
+  Memcached mcach(memc);
   memcached_return rc;
-  char *key= "inctest";
-  char *inc_value= "1";
+  const char *key= "inctest";
+  const char *inc_value= "1";
   char *ret_value;
   uint64_t int_inc_value;
   uint64_t int_ret_value;
@@ -62,13 +63,13 @@ uint8_t increment_test(memcached_st *memc)
   return 0;
 }
 
-uint8_t basic_master_key_test(memcached_st *memc)
+extern "C" test_return basic_master_key_test(memcached_st *memc)
 {
-  Memcached foo;
-  char *value_set= "Data for server A";
-  char *master_key_a= "server-a";
-  char *master_key_b= "server-b";
-  char *key= "xyz";
+   Memcached foo(memc);
+  const char *value_set= "Data for server A";
+  const char *master_key_a= "server-a";
+  const char *master_key_b= "server-b";
+  const char *key= "xyz";
   char *value;
   size_t value_length;
 
@@ -80,7 +81,7 @@ uint8_t basic_master_key_test(memcached_st *memc)
   value= foo.get_by_key(master_key_b, key, &value_length);
   assert((memcmp(value, value_set, value_length) == 0));
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
 
@@ -97,10 +98,8 @@ collection_st collection[] ={
 
 #define SERVERS_TO_CREATE 1
 
-void *world_create(void)
+extern "C" void *world_create(void)
 {
-  unsigned int x;
-  memcached_server_st *servers;
   server_startup_st *construct;
 
   construct= (server_startup_st *)malloc(sizeof(server_startup_st));
@@ -112,7 +111,7 @@ void *world_create(void)
   return construct;
 }
 
-void world_destroy(void *p)
+extern "C" void world_destroy(void *p)
 {
   server_startup_st *construct= (server_startup_st *)p;
   memcached_server_st *servers= (memcached_server_st *)construct->servers;