diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/corelib/thread/qfutureinterface.h | |
parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/corelib/thread/qfutureinterface.h')
-rw-r--r-- | src/corelib/thread/qfutureinterface.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index d5e2401eee..bcdae24833 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -45,6 +45,8 @@ #include <QtCore/qexception.h> #include <QtCore/qresultstore.h> +#include <mutex> + QT_REQUIRE_CONFIG(future); QT_BEGIN_NAMESPACE @@ -118,6 +120,7 @@ public: void waitForResume(); QMutex *mutex() const; + QMutex &mutex(int) const; QtPrivate::ExceptionStore &exceptionStore(); QtPrivate::ResultStoreBase &resultStoreBase(); const QtPrivate::ResultStoreBase &resultStoreBase() const; @@ -188,7 +191,7 @@ public: template <typename T> inline void QFutureInterface<T>::reportResult(const T *result, int index) { - QMutexLocker locker(mutex()); + std::lock_guard<QMutex> locker(mutex(0)); if (this->queryState(Canceled) || this->queryState(Finished)) { return; } @@ -214,7 +217,7 @@ inline void QFutureInterface<T>::reportResult(const T &result, int index) template <typename T> inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count) { - QMutexLocker locker(mutex()); + std::lock_guard<QMutex> locker(mutex(0)); if (this->queryState(Canceled) || this->queryState(Finished)) { return; } @@ -242,14 +245,14 @@ inline void QFutureInterface<T>::reportFinished(const T *result) template <typename T> inline const T &QFutureInterface<T>::resultReference(int index) const { - QMutexLocker lock(mutex()); + std::lock_guard<QMutex> locker(mutex(0)); return resultStoreBase().resultAt(index).template value<T>(); } template <typename T> inline const T *QFutureInterface<T>::resultPointer(int index) const { - QMutexLocker lock(mutex()); + std::lock_guard<QMutex> locker(mutex(0)); return resultStoreBase().resultAt(index).template pointer<T>(); } @@ -263,7 +266,7 @@ inline QList<T> QFutureInterface<T>::results() QFutureInterfaceBase::waitForResult(-1); QList<T> res; - QMutexLocker lock(mutex()); + std::lock_guard<QMutex> locker(mutex(0)); QtPrivate::ResultIteratorBase it = resultStoreBase().begin(); while (it != resultStoreBase().end()) { |