diff options
| -rw-r--r-- | src/corelib/thread/qmutex.h | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 4 |
2 files changed, 4 insertions, 4 deletions
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 <typename Mutex> -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 <typename Mutex> -class QMutexLocker +class [[nodiscard]] QMutexLocker { public: inline explicit QMutexLocker(Mutex *) noexcept {} diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 5c72e7415d..43e0718699 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -103,7 +103,7 @@ typedef QScopedPointerObjectDeleteLater<QObject> QScopedPointerDeleteLater; #endif template <typename T, typename Cleanup = QScopedPointerDeleter<T> > -class QScopedPointer +class [[nodiscard]] QScopedPointer { public: explicit QScopedPointer(T *p = nullptr) noexcept : d(p) @@ -223,7 +223,7 @@ private: }; template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> > -class QScopedArrayPointer : public QScopedPointer<T, Cleanup> +class [[nodiscard]] QScopedArrayPointer : public QScopedPointer<T, Cleanup> { template <typename Ptr> using if_same_type = typename std::enable_if<std::is_same<typename std::remove_cv<T>::type, Ptr>::value, bool>::type; |