From 2f522b22de0e79b499ee10a3a963eebdbb435fc8 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 28 Aug 2019 00:50:33 +0800 Subject: [PATCH] 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 --- src/crimson/net/Socket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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); -- 2.39.5