]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/net/Socket: adapt to seastar v2 api
authorKefu Chai <kchai@redhat.com>
Tue, 27 Aug 2019 16:50:33 +0000 (00:50 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 28 Aug 2019 06:46:43 +0000 (14:46 +0800)
variadic futures is deprecated in seastar api v2, so let's use the new
variant.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/net/Socket.h

index 21de1db2b3cac565ab1f0e090e1f0b864c2cce91..0bc61516138fc8acab0a775a6060a6f2fcbd4b28 100644 (file)
@@ -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);