From df759d34eb6db147f7e3a426e32ce9bdcc2340a8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 13 Jun 2023 09:33:08 +0200 Subject: [PATCH] QSemaphoreReleaser: plaster with [[nodiscard]] It's a RAII class, and RAII classes should be marked [[nodiscard]] at the class as well as the ctor level. Task-number: QTBUG-104164 Change-Id: Ie877e261cfe602410d9d9bb3acc658d0bb7c4e72 Reviewed-by: Fabian Kosmale (cherry picked from commit 6fc908c001a274360d3ff431ba16a1df9d8af089) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qsemaphore.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index 0e01f33f36c..0b9db83471b 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -61,14 +61,18 @@ bool QSemaphore::tryAcquire(int n, int timeout) } #endif -class QSemaphoreReleaser +class [[nodiscard]] QSemaphoreReleaser { public: + Q_NODISCARD_CTOR QSemaphoreReleaser() = default; + Q_NODISCARD_CTOR explicit QSemaphoreReleaser(QSemaphore &sem, int n = 1) noexcept : m_sem(&sem), m_n(n) {} + Q_NODISCARD_CTOR explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) noexcept : m_sem(sem), m_n(n) {} + Q_NODISCARD_CTOR QSemaphoreReleaser(QSemaphoreReleaser &&other) noexcept : m_sem(other.cancel()), m_n(other.m_n) {} QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QSemaphoreReleaser)