Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[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 5078f1f5583cea9c07ab32f5524eec8c3b5ed13c..8539c5e6dc9fe79c1f3f5d7f1f4d0f004198b8d5 100644 (file)
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -291,14 +291,5 @@ void get_world(Framework *world)
   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->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 }