From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 21 Dec 2020 02:41:10 +0000 (-0500)
Subject: osdc: Fix return type of map waiting functions
X-Git-Tag: v16.1.0~182^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38668%2Fhead;p=ceph.git

osdc: Fix return type of map waiting functions

Fixes: https://tracker.ceph.com/issues/47294
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

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",