X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=4a3789b93a741c427b4b541f79c1f1314b3fb197;hb=259796df2149b11286d58158255f868cadb470bb;hp=ec29b159f9ae5392abee9c02713ae4b88cc3ba23;hpb=6dbe9f6cd35e445cf3122d80bd7814370ded2aa0;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index ec29b159..4a3789b9 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,8 +1,9 @@
 /*
   C++ interface test
 */
+#include "libmemcached/memcached.hh"
+
 #include <assert.h>
-#include <memcached.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,7 +16,15 @@
 
 #include "test.h"
 
-extern "C" test_return basic_test(memcached_st *memc)
+extern "C" {
+   test_return basic_test(memcached_st *memc);
+   uint8_t increment_test(memcached_st *memc);
+   test_return basic_master_key_test(memcached_st *memc);
+   void *world_create(void);
+   void world_destroy(void *p);
+}
+
+test_return basic_test(memcached_st *memc)
 {
   Memcached foo(memc);
   const char *value_set= "This is some data";
@@ -30,7 +39,7 @@ extern "C" test_return basic_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-extern "C" uint8_t increment_test(memcached_st *memc)
+uint8_t increment_test(memcached_st *memc)
 {
   Memcached mcach(memc);
   memcached_return rc;
@@ -63,7 +72,7 @@ extern "C" uint8_t increment_test(memcached_st *memc)
   return 0;
 }
 
-extern "C" test_return basic_master_key_test(memcached_st *memc)
+test_return basic_master_key_test(memcached_st *memc)
 {
    Memcached foo(memc);
   const char *value_set= "Data for server A";
@@ -111,10 +120,11 @@ extern "C" void *world_create(void)
   return construct;
 }
 
-extern "C" void world_destroy(void *p)
+void world_destroy(void *p)
 {
-  server_startup_st *construct= (server_startup_st *)p;
-  memcached_server_st *servers= (memcached_server_st *)construct->servers;
+  server_startup_st *construct= static_cast<server_startup_st *>(p);
+  memcached_server_st *servers=
+    static_cast<memcached_server_st *>(construct->servers);
   memcached_server_list_free(servers);
 
   server_shutdown(construct);