From 535aef6082457f4f4b60d71203e467e5d2644145 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 28 Apr 2019 23:31:31 +0800 Subject: [PATCH] crimson/osd: silence -Wunused-variable warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit silence warning like /home/kchai/ceph/src/crimson/osd/heartbeat.cc:314:24: warning: unused variable ‘peer’ [-Wunused-variable] auto& [peer, info] = item; ^ Signed-off-by: Kefu Chai --- src/crimson/osd/heartbeat.cc | 6 +++--- src/crimson/osd/pg.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 4a1f04a775846..c983ebe6aff45 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -311,14 +311,14 @@ seastar::future<> Heartbeat::send_heartbeats() const auto now = clock::now(); const auto deadline = now + std::chrono::seconds(local_conf()->osd_heartbeat_grace); - auto& [peer, info] = item; + auto& info = item.second; info.last_tx = now; if (clock::is_zero(info.first_tx)) { info.first_tx = now; } const utime_t sent_stamp{now}; - auto [reply, added] = info.ping_history.emplace(sent_stamp, - reply_t{deadline, 0}); + [[maybe_unused]] auto [reply, added] = + info.ping_history.emplace(sent_stamp, reply_t{deadline, 0}); std::vector conns{info.con_front, info.con_back}; return seastar::parallel_for_each(std::move(conns), diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 868522945bbf9..a7a0daf09e9ed 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -409,7 +409,7 @@ PG::find_best_info(const PG::peer_info_t& infos) const // when you find bugs! auto min_last_update_acceptable = eversion_t::max(); epoch_t max_les = 0; - for (auto& [shard, info] : infos) { + for ([[maybe_unused]] auto& [shard, info] : infos) { if (max_les < info.history.last_epoch_started) { max_les = info.history.last_epoch_started; } @@ -418,7 +418,7 @@ PG::find_best_info(const PG::peer_info_t& infos) const max_les = info.last_epoch_started; } } - for (auto& [shard, info] : infos) { + for ([[maybe_unused]] auto& [shard, info] : infos) { if (max_les <= info.last_epoch_started && min_last_update_acceptable > info.last_update) { min_last_update_acceptable = info.last_update; -- 2.39.5