From e33eed9ef89dffdc111ddfbcca3fc7b291a630ab Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 1 May 2024 17:04:12 +0000 Subject: [PATCH] crimson/osd: fix compiler warnings on copy elision being prevented Signed-off-by: Radoslaw Zarzynski --- src/crimson/common/interruptible_future.h | 2 +- src/crimson/osd/ops_executer.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h index f23361b21fa..7cd2d5d4e11 100644 --- a/src/crimson/common/interruptible_future.h +++ b/src/crimson/common/interruptible_future.h @@ -1441,7 +1441,7 @@ public: ret = seastar::futurize_invoke(mapper, *begin++).then_wrapped_interruptible( [s = s.get(), ret = std::move(ret)] (auto f) mutable { try { - s->result = s->reduce(std::move(s->result), std::move(f.get())); + s->result = s->reduce(std::move(s->result), std::move(f).get()); return std::move(ret); } catch (...) { return std::move(ret).then_wrapped_interruptible([ex = std::current_exception()] (auto f) { diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index 5c303c9ec38..77206b6b061 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -1417,8 +1417,8 @@ static PG::interruptible_future do_pgls_common( }), seastar::make_ready_future(next)); }).then_interruptible([pg_end](auto&& ret) { - auto entries = std::move(std::get<0>(ret).get()); - auto next = std::move(std::get<1>(ret).get()); + auto entries = std::get<0>(ret).get(); + auto next = std::get<1>(std::move(ret)).get(); pg_ls_response_t response; response.handle = next.is_max() ? pg_end : next; response.entries = std::move(entries); -- 2.47.3