X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Finstance.hpp;h=c76dc7ee1db708cca782a0db81b761de73f11133;hb=92386115b06c66e4aa33850f20df8f88c174e58f;hp=d0a772b926c03fcf5a53668a5f8335442d69e0e6;hpb=51413212545b0e50b0f79f13994a792402814614;p=awesomized%2Flibmemcached

diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp
index d0a772b9..c76dc7ee 100644
--- a/libmemcached/instance.hpp
+++ b/libmemcached/instance.hpp
@@ -58,11 +58,8 @@
 
 #include "libmemcached/string.hpp"
 
-namespace org {
-namespace libmemcached {
-
 // @todo Complete class transformation
-struct Instance {
+struct memcached_instance_st {
   in_port_t port() const
   {
     return port_;
@@ -188,16 +185,13 @@ struct Instance {
   }
 };
 
-} // namespace libmemcached
-} // namespace org
-
-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_instance_st* __instance_create_with(memcached_st *memc,
+                                              memcached_instance_st* self,
+                                              const memcached_string_t& _hostname,
+                                              const in_port_t port,
+                                              uint32_t weight, 
+                                              const memcached_connection_t type);
 
-memcached_return_t memcached_instance_push(memcached_st *ptr, const org::libmemcached::Instance*, uint32_t);
+memcached_return_t memcached_instance_push(memcached_st *ptr, const memcached_instance_st*, uint32_t);
 
-void __instance_free(org::libmemcached::Instance *);
+void __instance_free(memcached_instance_st *);