From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 6 Jul 2020 16:50:11 +0000 (+0200)
Subject: crimson/common: switch errorator to use std::apply directly.
X-Git-Tag: v16.1.0~1424^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3eb060edcfe6b4ad18dad5b687041de867a8c42;p=ceph.git

crimson/common: switch errorator to use std::apply directly.

This is needed as newer versions of the framework have
the `seastar::apply` compatibility layer stripped.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index 52ade2dde1fc..7efc41836776 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -1038,8 +1038,8 @@ struct futurize<Container<::crimson::errorated_future_marker<Values...>>> {
   [[gnu::always_inline]]
   static inline type apply(Func&& func, std::tuple<FuncArgs...>&& args) noexcept {
     try {
-      return ::seastar::apply(std::forward<Func>(func),
-                              std::forward<std::tuple<FuncArgs...>>(args));
+      return std::apply(std::forward<Func>(func),
+                        std::forward<std::tuple<FuncArgs...>>(args));
     } catch (...) {
       return make_exception_future(std::current_exception());
     }