From: Kefu Chai <kchai@redhat.com>
Date: Tue, 27 Aug 2019 16:50:33 +0000 (+0800)
Subject: crimson/net/Socket: adapt to seastar v2 api
X-Git-Tag: v15.1.0~1746^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f522b22de0e79b499ee10a3a963eebdbb435fc8;p=ceph-ci.git

crimson/net/Socket: adapt to seastar v2 api

variadic futures is deprecated in seastar api v2, so let's use the new
variant.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/net/Socket.h b/src/crimson/net/Socket.h
index 21de1db2b3c..0bc61516138 100644
--- a/src/crimson/net/Socket.h
+++ b/src/crimson/net/Socket.h
@@ -62,8 +62,8 @@ class Socket
 
   static seastar::future<SocketFRef, entity_addr_t>
   accept(seastar::server_socket& listener) {
-    return listener.accept().then([] (seastar::connected_socket socket,
-				      seastar::socket_address paddr) {
+    return listener.accept().then([] (seastar::accept_result accept_result) {
+        auto [socket, paddr] = std::move(accept_result);
         entity_addr_t peer_addr;
         peer_addr.set_sockaddr(&paddr.as_posix_sockaddr());
         peer_addr.set_type(entity_addr_t::TYPE_ANY);