From 0165966200de1a1e8f362132e44c57aa31864b04 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Sun, 20 Dec 2020 21:41:10 -0500
Subject: [PATCH] osdc: Fix return type of map waiting functions

Fixes: https://tracker.ceph.com/issues/47294
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/osdc/Objecter.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 3d2b967d2fa61..96c036f7a082c 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -2764,8 +2764,7 @@ public:
   };
 
   template<typename CompletionToken>
-  typename boost::asio::async_result<CompletionToken, OpSignature>::return_type
-  wait_for_map(epoch_t epoch, CompletionToken&& token) {
+  auto wait_for_map(epoch_t epoch, CompletionToken&& token) {
     boost::asio::async_completion<CompletionToken, OpSignature> init(token);
 
     if (osdmap->get_epoch() >= epoch) {
@@ -2794,8 +2793,7 @@ private:
 public:
 
   template<typename CompletionToken>
-  typename boost::asio::async_result<CompletionToken, OpSignature>::return_type
-  wait_for_latest_osdmap(CompletionToken&& token) {
+  auto wait_for_latest_osdmap(CompletionToken&& token) {
     boost::asio::async_completion<CompletionToken, OpSignature> init(token);
 
     monc->get_version("osdmap",
-- 
2.47.3