Catch up with Gearman's libtest

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

diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp
index 5b3f7e8855a9318b27f6d01685fab5be70582756..a01544c5c10fd63a87e7ecdbd8f01bedf6208b81 100644 (file)
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -286,19 +286,10 @@ collection_st collection[] ={
 
 void get_world(Framework *world)
 {
-  world->collections= collection;
+  world->collections(collection);
 
-  world->_create= world_create;
-  world->_destroy= world_destroy;
-
-  world->item._startup= reinterpret_cast<test_callback_fn*>(world_test_startup);
-  world->item._flush= reinterpret_cast<test_callback_fn*>(world_flush);
-  world->item.set_pre(reinterpret_cast<test_callback_fn*>(world_pre_run));
-  world->item.set_post(reinterpret_cast<test_callback_fn*>(world_post_run));
-  world->_on_error= reinterpret_cast<test_callback_error_fn*>(world_on_error);
-
-  world->collection_startup= reinterpret_cast<test_callback_fn*>(world_container_startup);
-  world->collection_shutdown= reinterpret_cast<test_callback_fn*>(world_container_shutdown);
+  world->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
   world->set_runner(new LibmemcachedRunner);
 }