Turned on more warnings, and fixed the errors. Moved common.h, which includes

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index ec29b159f9ae5392abee9c02713ae4b88cc3ba23..7bb2a293499c3b793276e41b073e05103b4bf965 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -15,7 +15,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 +38,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 +71,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 +119,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);