Merge in fix for building with debug.

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index dc9f0df01d5f5fc86a5a76927d0c7ce0d932b982..105dbb79bc2fed11217a5643037237be3b1f545b 100644 (file)
--- 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 4acc3cddb9791ed02348f650c0e6bc2032fd3d4a..7dfd9d71034bfd79e893ef1b31778e0b97813f5e 100644 (file)
--- 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