From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 11 Dec 2019 10:53:37 +0000 (+0100)
Subject: crimson: make seastar::do_with() a friend of errorated futures.
X-Git-Tag: v15.1.0~541^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b667e8629bbfd261ec435ec9e0a644b090a2a56d;p=ceph-ci.git

crimson: make seastar::do_with() a friend of errorated futures.

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

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index dc0ec2e61c8..137f55d0a16 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -604,6 +604,10 @@ private:
 
     template <class...>
     friend class ::seastar::future;
+
+    // let seastar::do_with to up-cast us to seastar::future.
+    template<typename T, typename F>
+    friend inline auto ::seastar::do_with(T&&, F&&);
   };
 
 public: