X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=f68e1f6b81bf3ad734fc8535540cb5d869c3319a;hb=4db614a7b66e3a293b484f8d853b4f5892d2d1d8;hp=a9d7c7284184ff3111a0c87b73d958486692b8f2;hpb=0d34e2e86b16fcd4d459e684f56cb88296cea2a1;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index a9d7c728..f68e1f6b 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -106,7 +106,7 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
 }
 
 memcached_server_st *__server_create_with(memcached_st *memc,
-                                          memcached_server_st* self,
+                                          memcached_server_st* allocated_instance,
                                           const memcached_string_t& hostname,
                                           const in_port_t port,
                                           uint32_t weight, 
@@ -118,16 +118,16 @@ memcached_server_st *__server_create_with(memcached_st *memc,
     return NULL;
   }
 
-  self= _server_create(self, memc);
+  allocated_instance= _server_create(allocated_instance, memc);
 
-  if (self == NULL)
+  if (allocated_instance == NULL)
   {
     return NULL;
   }
 
-  _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
+  _server_init(allocated_instance, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
-  return self;
+  return allocated_instance;
 }
 
 void __server_free(memcached_server_st *self)
@@ -208,7 +208,7 @@ in_port_t memcached_server_port(const memcached_server_instance_st self)
     return 0;
   }
 
-  return self->port;
+  return self->port();
 }
 
 uint32_t memcached_server_response_count(const memcached_server_instance_st self)
@@ -219,7 +219,7 @@ uint32_t memcached_server_response_count(const memcached_server_instance_st self
     return 0;
   }
 
-  return self->cursor_active;
+  return self->cursor_active_;
 }
 
 const char *memcached_server_type(const memcached_server_instance_st ptr)