From: Kefu Chai <kchai@redhat.com>
Date: Tue, 11 Feb 2020 09:57:42 +0000 (+0800)
Subject: crimson/common: more friendly to seastar::do_with()
X-Git-Tag: v15.1.1~474^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33199%2Fhead;p=ceph.git

crimson/common: more friendly to seastar::do_with()

so we don't need to do the box-unbox dance when callng
seastar::do_with() with multiple with'ed variables and
a continuation which returns `errator<...>::future`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index f26b65847c4e..91d26fa10dd2 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -614,6 +614,8 @@ private:
     // let seastar::do_with to up-cast us to seastar::future.
     template<typename T, typename F>
     friend inline auto ::seastar::do_with(T&&, F&&);
+    template<typename T1, typename T2, typename T3_or_F, typename... More>
+    friend inline auto ::seastar::do_with(T1&& rv1, T2&& rv2, T3_or_F&& rv3, More&&... more);
   };
 
 public: