From: Haomai Wang <haomaiwang@gmail.com>
Date: Sat, 6 Dec 2014 11:27:22 +0000 (+0800)
Subject: AsyncConnection: Avoid name conflicting with AsyncMessenger
X-Git-Tag: v0.91~37^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e446a8f620676fca2a8e8bfc61c9bce6e80f970a;p=ceph.git

AsyncConnection: Avoid name conflicting with AsyncMessenger

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 474b6685f12fe..68f34d613e520 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -97,23 +97,23 @@ class C_handle_dispatch : public EventCallback {
   }
 };
 
-class C_handle_connect : public EventCallback {
+class C_deliver_connect : public EventCallback {
   AsyncMessenger *msgr;
   AsyncConnectionRef conn;
 
  public:
-  C_handle_connect(AsyncMessenger *msgr, AsyncConnectionRef c): msgr(msgr), conn(c) {}
+  C_deliver_connect(AsyncMessenger *msgr, AsyncConnectionRef c): msgr(msgr), conn(c) {}
   void do_request(int id) {
     msgr->ms_deliver_handle_connect(conn.get());
   }
 };
 
-class C_handle_accept : public EventCallback {
+class C_deliver_accept : public EventCallback {
   AsyncMessenger *msgr;
   AsyncConnectionRef conn;
 
  public:
-  C_handle_accept(AsyncMessenger *msgr, AsyncConnectionRef c): msgr(msgr), conn(c) {}
+  C_deliver_accept(AsyncMessenger *msgr, AsyncConnectionRef c): msgr(msgr), conn(c) {}
   void do_request(int id) {
     msgr->ms_deliver_handle_accept(conn.get());
   }
@@ -178,8 +178,8 @@ AsyncConnection::AsyncConnection(CephContext *cct, AsyncMessenger *m, EventCente
   remote_reset_handler.reset(new C_handle_remote_reset(async_msgr, this));
   stop_handler.reset(new C_handle_stop(this));
   signal_handler.reset(new C_handle_signal(this));
-  connect_handler.reset(new C_handle_connect(async_msgr, this));
-  accept_handler.reset(new C_handle_connect(async_msgr, this));
+  connect_handler.reset(new C_deliver_connect(async_msgr, this));
+  accept_handler.reset(new C_deliver_accept(async_msgr, this));
   memset(msgvec, 0, sizeof(msgvec));
 }