X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=ee898d4e4662379123a621ce4b355bd62b8bb49c;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=6ffd090f7822ea0b1ee61af938fa58fa182f6e3c;hpb=2191fc2c85649f89087abb3bde2c7ca5398d42ca;p=m6w6%2Flibmemcached diff --git a/tests/plus.cpp b/tests/plus.cpp index 6ffd090f..ee898d4e 100644 --- a/tests/plus.cpp +++ b/tests/plus.cpp @@ -29,7 +29,7 @@ extern "C" { test_return_t mget_result_function(memcached_st *memc); test_return_t basic_behavior(memcached_st *memc); test_return_t mget_test(memcached_st *memc); - memcached_return callback_counter(memcached_st *, + memcached_return_t callback_counter(memcached_st *, memcached_result_st *, void *context); void *world_create(void); @@ -152,9 +152,9 @@ test_return_t basic_master_key_test(memcached_st *memc) } /* Count the results */ -memcached_return callback_counter(memcached_st *, - memcached_result_st *, - void *context) +memcached_return_t callback_counter(memcached_st *, + memcached_result_st *, + void *context) { unsigned int *counter= static_cast(context); @@ -187,7 +187,7 @@ test_return_t mget_result_function(memcached_st *memc) values.push_back(&val2); values.push_back(&val3); unsigned int counter; - memcached_execute_function callbacks[1]; + memcached_execute_fn callbacks[1]; /* We need to empty the server before we continue the test */ rc= mc.flush(0); @@ -210,7 +210,7 @@ test_return_t mget_test(memcached_st *memc) { Memcache mc(memc); bool rc; - memcached_return mc_rc; + memcached_return_t mc_rc; vector keys; vector< vector *> values; keys.reserve(3);