]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/common/interruptible_future: add common errorator forwards
authorSamuel Just <sjust@redhat.com>
Wed, 2 Jun 2021 03:05:12 +0000 (20:05 -0700)
committerSamuel Just <sjust@redhat.com>
Wed, 23 Jun 2021 18:23:34 +0000 (18:23 +0000)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/crimson/common/interruptible_future.h

index 9323048431870c9b8289dcc5cc66a492a3ef2e06..9dc3e53c32276a807bcb2691008d9994630905f3 100644 (file)
@@ -487,6 +487,16 @@ struct interruptible_errorator {
   using future = interruptible_future_detail<InterruptCond,
        typename Errorator::template future<ValueT>>;
 
+  template <class... NewAllowedErrorsT>
+  using extend = interruptible_errorator<
+    InterruptCond,
+    typename Errorator::template extend<NewAllowedErrorsT...>>;
+
+  template <class Ertr>
+  using extend_ertr = interruptible_errorator<
+    InterruptCond,
+    typename Errorator::template extend_ertr<Ertr>>;
+
   template <typename ValueT = void, typename... A>
   static interruptible_future_detail<
     InterruptCond,
@@ -513,6 +523,10 @@ struct interruptible_errorator {
       InterruptCond, typename Errorator::template future<>>(
        Errorator::now());
   }
+
+  using pass_further = typename Errorator::pass_further;
+  using ready_future_marker = ready_future_marker;
+  using exception_future_marker = exception_future_marker;
 };
 
 template <typename InterruptCond,