]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: Fix return type of map waiting functions 38668/head
authorAdam C. Emerson <aemerson@redhat.com>
Mon, 21 Dec 2020 02:41:10 +0000 (21:41 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Mon, 21 Dec 2020 06:12:24 +0000 (01:12 -0500)
Fixes: https://tracker.ceph.com/issues/47294
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/osdc/Objecter.h

index 3d2b967d2fa6150c2cf4d62ab8c632688d0399a0..96c036f7a082cce9595cd0b0b73da0f890c49bdb 100644 (file)
@@ -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",