X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finstance.hpp;h=1c614ab1f30db75f4855f517ee23a670c98d9ea8;hb=eff4858179d7883b92ab8682392357d104d5a8ab;hp=3c9dea358f91c630d4d13afafb8f2412b5be945c;hpb=ca663a567bc8d3facb22b035bcad19349e42a9b1;p=m6w6%2Flibmemcached

diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp
index 3c9dea35..1c614ab1 100644
--- a/libmemcached/instance.hpp
+++ b/libmemcached/instance.hpp
@@ -2,7 +2,7 @@
  * 
  *  Libmemcached library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/ 
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/ 
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -38,21 +38,23 @@
 
 #pragma once
 
-struct memcached_instance_st *__instance_create_with(memcached_st *memc,
-                                                     struct memcached_instance_st* self,
-                                                     const memcached_string_t& hostname,
-                                                     const in_port_t port,
-                                                     uint32_t weight, 
-                                                     const memcached_connection_t type);
-void __instance_free(struct memcached_instance_st *);
+org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
+                                                    org::libmemcached::Instance* self,
+                                                    const memcached_string_t& hostname,
+                                                    const in_port_t port,
+                                                    uint32_t weight, 
+                                                    const memcached_connection_t type);
 
-memcached_server_st *memcached_instance_2_server(struct memcached_instance_st*);
+const char *memcached_instance_name(const org::libmemcached::Instance* self);
 
-memcached_return_t memcached_instance_push(memcached_st *ptr, const struct memcached_instance_st*, uint32_t);
+in_port_t memcached_instance_port(const org::libmemcached::Instance* self);
+
+memcached_return_t memcached_instance_push(memcached_st *ptr, const org::libmemcached::Instance*, uint32_t);
+
+memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source);
 
-uint32_t memcached_instance_set_count(memcached_instance_st *servers, uint32_t count);
-const char *memcached_instance_name(const memcached_server_instance_st self);
-in_port_t memcached_instance_port(const memcached_server_instance_st self);
-uint32_t memcached_instance_response_count(const memcached_instance_st* self);
 uint32_t memcached_instance_count(const memcached_st* self);
 
+uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
+
+void __instance_free(org::libmemcached::Instance *);