From c578d9943afd4478d9bf813067b002f2679df1d4 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sat, 18 Sep 2021 11:29:23 +0200 Subject: Plaster [[nodiscard]] on some RAII classes The idea is to prevent silly mistakes such as QMutexLocker(mutex); doSomething(); where the locker is constructed and destroyed immediately. Compilers don't normally warn in these cases (as the constructor/destructor pairs involved do have side effects), but we can mark the type as [[nodiscard]] to encourage warnings. There is another couple of classes for which this would make sense (notably, the R/W lockers), but unfortunately those are exported classes, and GCC has a bug where one can't mix two different attribute syntaxes on the same entity [1], so I'm skipping those. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102399 Change-Id: I75a2443dc71e6b80613b8edd52a04d3379355728 Reviewed-by: Qt CI Bot Reviewed-by: Volker Hilsheimer --- src/corelib/thread/qmutex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/thread') diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 3e861ca0cb..19463da619 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -235,7 +235,7 @@ public: }; template -class QMutexLocker +class [[nodiscard]] QMutexLocker { public: inline explicit QMutexLocker(Mutex *mutex) QT_MUTEX_LOCK_NOEXCEPT @@ -313,7 +313,7 @@ private: class QRecursiveMutex : public QMutex {}; template -class QMutexLocker +class [[nodiscard]] QMutexLocker { public: inline explicit QMutexLocker(Mutex *) noexcept {} -- cgit v1.2.3