From: Samuel Just <sjust@redhat.com>
Date: Thu, 10 Jun 2021 00:32:44 +0000 (-0700)
Subject: crimson/common/interruptible_future: add futurize::invoke
X-Git-Tag: v17.1.0~1567^2~20
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d10ffa368541907d80790423b5956175ebceb18a;p=ceph.git

crimson/common/interruptible_future: add futurize::invoke

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h
index 9dc3e53c32276..8cb516453e65c 100644
--- a/src/crimson/common/interruptible_future.h
+++ b/src/crimson/common/interruptible_future.h
@@ -889,6 +889,13 @@ public:
       return seastar::futurize<T>::apply(std::forward<Func>(func),
 					 std::forward<std::tuple<Args...>>(args));
     }
+
+    template <typename Func, typename... Args>
+    static type invoke(Func&& func, Args&&... args) noexcept {
+      return seastar::futurize<T>::invoke(
+	std::forward<Func>(func),
+	std::forward<Args>(args)...);
+    }
   };
 
   template <typename FutureType>
@@ -901,6 +908,13 @@ public:
 	  std::forward<Func>(func),
 	  std::forward<std::tuple<Args...>>(args));
     }
+
+    template <typename Func, typename... Args>
+    static type invoke(Func&& func, Args&&... args) noexcept {
+      return seastar::futurize<FutureType>::invoke(
+	  std::forward<Func>(func),
+	  std::forward<Args>(args)...);
+    }
   };
 
   template <typename T>