X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fhosts.cc;h=ad01decd70faa1c4e494714db853cfb8011aac0d;hb=ac25aff8b62e8596e20f0fd2a2c3eda96bdb437e;hp=39247287666d55fed37f5b5f72242057fa5f462d;hpb=6b7d2bf0319e0bd48bd6aa4ad8c56a935f98b0d2;p=m6w6%2Flibmemcached

diff --git a/src/libmemcached/hosts.cc b/src/libmemcached/hosts.cc
index 39247287..ad01decd 100644
--- a/src/libmemcached/hosts.cc
+++ b/src/libmemcached/hosts.cc
@@ -15,12 +15,10 @@
 
 #include "libmemcached/common.h"
 #include "libmemcached/assert.hpp"
+#include "p9y/gettimeofday.hpp"
+#include "p9y/random.hpp"
 
 #include <cmath>
-#if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
-#include <time.h>
 
 /* Protoypes (static) */
 static memcached_return_t update_continuum(Memcached *ptr);
@@ -313,7 +311,7 @@ static memcached_return_t server_add(Memcached *memc, const memcached_string_t &
   memcached_instance_st *instance =
       memcached_instance_fetch(memc, memcached_server_count(memc) - 1);
 
-  if (__instance_create_with(memc, instance, hostname, port, weight, type) == NULL) {
+  if (instance_create_with(memc, instance, hostname, port, weight, type) == NULL) {
     return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
   }
 
@@ -355,8 +353,7 @@ memcached_return_t memcached_server_push(memcached_st *shell, const memcached_se
       WATCHPOINT_ASSERT(instance);
 
       memcached_string_t hostname = {memcached_string_make_from_cstr(list[x].hostname)};
-      if (__instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight,
-                                 list[x].type)
+      if (instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight, list[x].type)
           == NULL)
       {
         ptr->state.is_parsing = false;
@@ -406,8 +403,7 @@ memcached_return_t memcached_instance_push(memcached_st *ptr,
     WATCHPOINT_ASSERT(instance);
 
     memcached_string_t hostname = {memcached_string_make_from_cstr(list[x]._hostname)};
-    if (__instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight,
-                               list[x].type)
+    if (instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight, list[x].type)
         == NULL)
     {
       ptr->state.is_parsing = false;