]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/common: switch errorator to use std::apply directly.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 6 Jul 2020 16:50:11 +0000 (18:50 +0200)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 6 Aug 2020 21:59:05 +0000 (17:59 -0400)
This is needed as newer versions of the framework have
the `seastar::apply` compatibility layer stripped.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/common/errorator.h

index 52ade2dde1fccca8eb7e34ed3a71fc1b1032902e..7efc41836776e57ccb97f9c167977cc0ce52cd25 100644 (file)
@@ -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());
     }