X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.cc;h=7ece03b9bbabad323c11a58480f01b21277989a9;hb=04e4d81e039c4aa1f048782c13a6771e8aa2172c;hp=8b33255bd7b1abc73d8369d8d20e753db6686b64;hpb=39575a40cf067da39e3f578bb3439d17ebd27638;p=awesomized%2Flibmemcached

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index 8b33255b..7ece03b9 100644
--- a/libmemcached/quit.cc
+++ b/libmemcached/quit.cc
@@ -38,7 +38,7 @@
 #include <libmemcached/common.h>
 
 namespace {
-  memcached_return_t send_quit_message(org::libmemcached::Instance* instance)
+  memcached_return_t send_quit_message(memcached_instance_st* instance)
   {
     memcached_return_t rc;
     if (instance->root->flags.binary_protocol)
@@ -70,7 +70,7 @@ namespace {
     return rc;
   }
 
-  void drain_instance(org::libmemcached::Instance* instance)
+  void drain_instance(memcached_instance_st* instance)
   {
     /* read until socket is closed, or there is an error
      * closing the socket before all data is read
@@ -105,7 +105,7 @@ namespace {
   will force data to be completed.
 */
 
-void memcached_quit_server(org::libmemcached::Instance* instance, bool io_death)
+void memcached_quit_server(memcached_instance_st* instance, bool io_death)
 {
   if (instance->valid())
   {
@@ -126,18 +126,19 @@ void memcached_quit_server(org::libmemcached::Instance* instance, bool io_death)
   }
 }
 
-void send_quit(memcached_st *memc)
+void send_quit(Memcached *memc)
 {
   for (uint32_t x= 0; x < memcached_server_count(memc); x++)
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
+    memcached_instance_st* instance= memcached_instance_fetch(memc, x);
 
     memcached_quit_server(instance, false);
   }
 }
 
-void memcached_quit(memcached_st *memc)
+void memcached_quit(memcached_st *shell)
 {
+  Memcached* memc= memcached2Memcached(shell);
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_query(memc, true)))
   {