diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-06-13 09:34:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-06-14 00:04:14 +0200 |
| commit | 123118f82958bb48cb9cf5f46b72c0298fe8c7f3 (patch) | |
| tree | 7c8293f8958254081e389e6119ccc75fbe16e2fb /src/corelib/thread/qorderedmutexlocker_p.h | |
| parent | c8473c090367496885410ce70c0305b6d2b56ce7 (diff) | |
QOrderedMutexLocker: plaster with [[nodiscard]]
It's a RAII class, and RAII classes should be marked [[nodiscard]] at
the class as well as the ctor level.
Pick-to: 6.6
Task-number: QTBUG-104164
Change-Id: Ie88023ba7c57dad7c2116c1c19a80b908b3a9f4d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qorderedmutexlocker_p.h')
| -rw-r--r-- | src/corelib/thread/qorderedmutexlocker_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index 730ba61273..ec4630e034 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -28,9 +28,10 @@ QT_BEGIN_NAMESPACE Locks 2 mutexes in a defined order, avoiding a recursive lock if we're trying to lock the same mutex twice. */ -class QOrderedMutexLocker +class [[nodiscard]] QOrderedMutexLocker { public: + Q_NODISCARD_CTOR QOrderedMutexLocker(QBasicMutex *m1, QBasicMutex *m2) : mtx1((m1 == m2) ? m1 : (std::less<QBasicMutex *>()(m1, m2) ? m1 : m2)), mtx2((m1 == m2) ? nullptr : (std::less<QBasicMutex *>()(m1, m2) ? m2 : m1)), @@ -50,6 +51,7 @@ public: QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QOrderedMutexLocker) + Q_NODISCARD_CTOR QOrderedMutexLocker(QOrderedMutexLocker &&other) noexcept : mtx1(std::exchange(other.mtx1, nullptr)) , mtx2(std::exchange(other.mtx2, nullptr)) @@ -147,11 +149,13 @@ private: #else -class QOrderedMutexLocker +class [[nodiscard]] QOrderedMutexLocker { public: Q_DISABLE_COPY(QOrderedMutexLocker) + Q_NODISCARD_CTOR QOrderedMutexLocker(QBasicMutex *, QBasicMutex *) {} + Q_NODISCARD_CTOR QOrderedMutexLocker(QOrderedMutexLocker &&) = default; QOrderedMutexLocker& operator=(QOrderedMutexLocker &&other) = default; ~QOrderedMutexLocker() {} |