From 17fa1b6fede10765a8f483727358c98aa324e656 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Mon, 13 Mar 2017 11:16:19 -0700 Subject: [PATCH] Fix compiler warnings raised by llvm 8.0. Warning was: warning: moving a temporary object prevents copy elision [-Wpessimizing-move] --- src/input/readers/raw/Plugin.cc | 2 +- src/threading/Queue.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc index 0dd1b47fc7..e16a233fe6 100644 --- a/src/input/readers/raw/Plugin.cc +++ b/src/input/readers/raw/Plugin.cc @@ -30,6 +30,6 @@ void Plugin::Done() std::unique_lock Plugin::ForkMutex() { - return std::move(std::unique_lock(fork_mutex, std::defer_lock)); + return std::unique_lock(fork_mutex, std::defer_lock); } diff --git a/src/threading/Queue.h b/src/threading/Queue.h index bf0f0db82c..9ac9268a7a 100644 --- a/src/threading/Queue.h +++ b/src/threading/Queue.h @@ -124,7 +124,7 @@ inline static std::unique_lock acquire_lock(std::mutex& m) { try { - return std::move(std::unique_lock(m)); + return std::unique_lock(m); } catch ( const std::system_error& e ) { @@ -224,7 +224,7 @@ inline std::vector> Queue::LocksForAllQueues() throw std::exception(); } - return std::move(locks); + return locks; } template