From: Brian Aker Date: Tue, 14 Feb 2012 16:31:54 +0000 (-0800) Subject: Merge of warnings. X-Git-Tag: 1.0.7~17^2~15 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=abaee9e821c2037ba594e89879177c7dddbfb9ea;hp=7381d22f76e658496685bf3e9ea17c49203a04c5;p=awesomized%2Flibmemcached Merge of warnings. --- diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4 index 89103bd6..8b52f6ca 100644 --- a/m4/pandora_warnings.m4 +++ b/m4/pandora_warnings.m4 @@ -236,8 +236,8 @@ uint16_t x= htons(80); [NO_CONVERSION="-Wno-conversion"]) ]) - CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}" - CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}" + CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align -Wsign-compare ${CC_WARNINGS_FULL}" + CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long -Wsign-compare ${CXX_WARNINGS_FULL}" AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++], [ac_cv_safe_to_use_Wmissing_declarations_], diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index fd3dc46e..73162d3a 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -41,7 +41,6 @@ using namespace libtest; /* Number of times to run the test loop */ #define TEST_COUNTER 500000 -static uint32_t global_count; static pairs_st *global_pairs; static char *global_keys[GLOBAL_COUNT]; @@ -57,9 +56,8 @@ static test_return_t cleanup_pairs(memcached_st *) static test_return_t generate_pairs(memcached_st *) { global_pairs= pairs_generate(GLOBAL_COUNT, 400); - global_count= GLOBAL_COUNT; - for (ptrdiff_t x= 0; x < global_count; x++) + for (ptrdiff_t x= 0; x < GLOBAL_COUNT; x++) { global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length;