From 99918ce40387c7bc403d48609c588e68661cd734 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 6 May 2020 17:42:17 +0800 Subject: [PATCH] crimson/common: make do_with() noexcept to be consistent with seasetar change of 85aa178d9539b2c9301d4fb0815596a741fb82c4, which make `seasetar::do_with()` noexcept Signed-off-by: Kefu Chai --- src/crimson/common/errorator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h index e5a814729dd..4d7a7e16740 100644 --- a/src/crimson/common/errorator.h +++ b/src/crimson/common/errorator.h @@ -625,9 +625,9 @@ private: // let seastar::do_with to up-cast us to seastar::future. template - friend inline auto ::seastar::do_with(T&&, F&&); + friend inline auto ::seastar::do_with(T&&, F&&) noexcept; template - friend inline auto ::seastar::do_with(T1&& rv1, T2&& rv2, T3_or_F&& rv3, More&&... more); + friend inline auto ::seastar::do_with(T1&& rv1, T2&& rv2, T3_or_F&& rv3, More&&... more) noexcept; }; class Enabler {}; -- 2.39.5