From 4e6e554125a44f9bf65aad97178eb9483e8b8c91 Mon Sep 17 00:00:00 2001 From: Lucas Alber Date: Sun, 26 Jan 2025 14:23:10 +0100 Subject: [PATCH] merian: ConcurrentQueue: Fix clang tidy warnings --- include/merian/utils/concurrent/concurrent_queue.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/merian/utils/concurrent/concurrent_queue.hpp b/include/merian/utils/concurrent/concurrent_queue.hpp index 0f68b576..89accf6e 100644 --- a/include/merian/utils/concurrent/concurrent_queue.hpp +++ b/include/merian/utils/concurrent/concurrent_queue.hpp @@ -14,7 +14,7 @@ template class ConcurrentQueue { ConcurrentQueue(ConcurrentQueue& other) = delete; - ConcurrentQueue(ConcurrentQueue&& other) { + ConcurrentQueue(ConcurrentQueue&& other) noexcept { std::unique_lock lk_other(other.mutex); std::unique_lock lk(mutex); q = std::move(other.q); @@ -22,7 +22,7 @@ template class ConcurrentQueue { ConcurrentQueue& operator=(const ConcurrentQueue& src) = delete; - ConcurrentQueue& operator=(ConcurrentQueue&& src) { + ConcurrentQueue& operator=(ConcurrentQueue&& src) noexcept { if (this == &src) return *this; this->~ConcurrentQueue(); @@ -54,7 +54,6 @@ template class ConcurrentQueue { void wait_empty() { std::unique_lock lk(mutex); cv_empty.wait(lk, [&] { return q.empty(); }); - return; } T pop() {