From 1dfddd83e9b1b36b237b8b95497708246efca800 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 9 Jun 2021 17:07:33 -0700 Subject: [PATCH] common/interruptible_future: use errorated future as core_type, fix constructor No reason really to remember the underlying seastar::future type, we should only be interacting with the errorated future wrapped type. Signed-off-by: Samuel Just --- src/crimson/common/interruptible_future.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h index d2ae5e8880c..93230484318 100644 --- a/src/crimson/common/interruptible_future.h +++ b/src/crimson/common/interruptible_future.h @@ -524,7 +524,9 @@ class [[nodiscard]] interruptible_future_detail< : private ErroratedFuture<::crimson::errorated_future_marker> { public: - using core_type = ErroratedFuture<::crimson::errorated_future_marker>; + using core_type = ErroratedFuture>; + using errorator_type = typename core_type::errorator_type; + template using interrupt_futurize_t = typename interruptor::template futurize_t; @@ -542,14 +544,7 @@ public: [[gnu::always_inline]] interruptible_future_detail( ErroratedFuture2<::crimson::errorated_future_marker>&& fut) - : core_type(std::move(fut)) { - using src_errorator_t = \ - typename ErroratedFuture2< - ::crimson::errorated_future_marker>::errorator_type; - static_assert(core_type::errorator_type::template contains_once_v< - src_errorator_t>, - "conversion is only possible from less-or-eq errorated future!"); - } + : core_type(std::move(fut)) {} template