From fa5c9a2568222def0bd42d4588531891d3cae1a3 Mon Sep 17 00:00:00 2001 From: Tyler Neely Date: Fri, 4 Nov 2022 11:33:02 +0000 Subject: [PATCH] Make items popped from *worker::Queue const. Use std::move instead of std::forward in one place --- src/coordinator/coordinator_worker.hpp | 4 ++-- src/storage/v3/shard_worker.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coordinator/coordinator_worker.hpp b/src/coordinator/coordinator_worker.hpp index 888d6283a..f449e63e9 100644 --- a/src/coordinator/coordinator_worker.hpp +++ b/src/coordinator/coordinator_worker.hpp @@ -86,7 +86,7 @@ class Queue { MG_ASSERT(inner_.use_count() > 0); std::unique_lock lock(inner_->mu); - inner_->queue.emplace_back(std::forward(message)); + inner_->queue.emplace_back(std::move(message)); } // lock dropped before notifying condition variable inner_->cv.notify_all(); @@ -100,7 +100,7 @@ class Queue { inner_->cv.wait(lock); } - Message message = std::move(inner_->queue.front()); + const Message message = std::move(inner_->queue.front()); inner_->queue.pop_front(); return message; diff --git a/src/storage/v3/shard_worker.hpp b/src/storage/v3/shard_worker.hpp index 46e02e6cc..52677567a 100644 --- a/src/storage/v3/shard_worker.hpp +++ b/src/storage/v3/shard_worker.hpp @@ -109,7 +109,7 @@ class Queue { inner_->cv.wait(lock); } - Message message = std::move(inner_->queue.front()); + const Message message = std::move(inner_->queue.front()); inner_->queue.pop_front(); return message;