From: Brian Aker Date: Tue, 14 Jun 2011 16:42:32 +0000 (-0700) Subject: Merge in fix for building with debug. X-Git-Tag: 0.51~4^2~15 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fb31e254677214967ec4f8edfce62e5dc7405c2e;p=awesomized%2Flibmemcached Merge in fix for building with debug. --- diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc index dc9f0df0..105dbb79 100644 --- a/libmemcached/connect.cc +++ b/libmemcached/connect.cc @@ -179,7 +179,7 @@ static memcached_return_t set_hostinfo(memcached_server_st *server) default: { WATCHPOINT_STRING(server->hostname); - WATCHPOINT_STRING(gai_strerror(e)); + WATCHPOINT_STRING(gai_strerror(errcode)); return memcached_set_error(*server, MEMCACHED_HOST_LOOKUP_FAILURE, MEMCACHED_AT, memcached_string_make_from_cstr(gai_strerror(errcode))); } } diff --git a/libmemcached/hosts.cc b/libmemcached/hosts.cc index 4acc3cdd..7dfd9d71 100644 --- a/libmemcached/hosts.cc +++ b/libmemcached/hosts.cc @@ -333,7 +333,7 @@ static memcached_return_t update_continuum(memcached_st *ptr) #ifdef DEBUG for (uint32_t pointer_index= 0; memcached_server_count(ptr) && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++) { - WATCHPOINT_ASSERT(ptr->continuum[pointer_index].value <= ptr->continuum[pointer_index + 1].value); + WATCHPOINT_ASSERT(ptr->ketama.continuum[pointer_index].value <= ptr->ketama.continuum[pointer_index + 1].value); } #endif