diff options
Diffstat (limited to 'tests/libmemcached-1.0/mem_functions.cc')
| -rw-r--r-- | tests/libmemcached-1.0/mem_functions.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index a1daa8ab..b83ebb86 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -46,7 +46,7 @@ Test cases */ -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <libmemcached/is.h> #include <libmemcached/server_instance.h> @@ -76,7 +76,7 @@ using namespace libtest; -#include <libmemcachedutil-1.0/util.h> +#include <libmemcachedutil-1.2/util.h> #include "tests/hash_results.h" @@ -3731,7 +3731,7 @@ test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // Create a handle. memcached_st *tl_memc_h= memcached(test_literal_param("--server=localhost:9898 --server=localhost:9899")); // This server should not exist @@ -3757,7 +3757,7 @@ test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // See if memcached is reachable. char *value= memcached_get(memc, @@ -3781,7 +3781,7 @@ test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // Create a handle. memcached_st *tl_memc_h= memcached_create(NULL); @@ -3811,7 +3811,7 @@ test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // See if memcached is reachable. char *value= memcached_get_by_key(memc, @@ -4372,7 +4372,7 @@ test_return_t wrong_failure_counter_two_test(memcached_st *memc) /* Check if we still are connected */ uint32_t flags; size_t string_length; - memcached_return rc; + memcached_return_t rc; char *string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); @@ -4437,7 +4437,7 @@ test_return_t regression_bug_490486(memcached_st *original_memc) char blob[1024]= { 0 }; for (size_t x= 0; x < keys.size(); ++x) { - memcached_return rc= memcached_set(memc, + memcached_return_t rc= memcached_set(memc, keys.key_at(x), keys.length_at(x), blob, sizeof(blob), 0, 0); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); // MEMCACHED_TIMEOUT <-- hash been observed on OSX @@ -4447,7 +4447,7 @@ test_return_t regression_bug_490486(memcached_st *original_memc) /* Try to get all of them with a large multiget */ size_t counter= 0; - memcached_execute_function callbacks[]= { &callback_counter }; + memcached_execute_fn callbacks[]= { &callback_counter }; memcached_return_t rc= memcached_mget_execute(memc, keys.keys_ptr(), keys.lengths_ptr(), keys.size(), callbacks, &counter, 1); @@ -4635,7 +4635,7 @@ test_return_t regression_bug_490520(memcached_st *original_memc) char key[251]; int key_length= snprintf(key, sizeof(key), "0200%u", x); - memcached_return rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); + memcached_return_t rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); } @@ -4728,7 +4728,7 @@ test_return_t regression_bug_854604(memcached_st *) return TEST_SUCCESS; } -static void die_message(memcached_st* mc, memcached_return error, const char* what, uint32_t it) +static void die_message(memcached_st* mc, memcached_return_t error, const char* what, uint32_t it) { fprintf(stderr, "Iteration #%u: ", it); @@ -4759,7 +4759,7 @@ test_return_t regression_bug_(memcached_st *memc) for (uint32_t x= 0; x < TEST_CONSTANT_CREATION; x++) { memcached_st* mc= memcached_create(NULL); - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); if (rc != MEMCACHED_SUCCESS) |