diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-19 09:47:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-19 11:40:35 +0200 |
| commit | 8bb3c656be7df26b260c217cd92bab6c9664981a (patch) | |
| tree | 1a12e45ed13e9dab8d6b8517bfa8c5fc4ca7d113 /src/core/jobs | |
| parent | f4d79d40b9aa085afa4d7a0dd012cfc4263cd39f (diff) | |
Fix deprecation warnings related to QBasicAtomicInteger
Use loadRelaxed(), storeRelaxed(), fixing warnings like:
renderers/opengl/renderer/renderer.cpp:451:22: warning: ‘void QBasicAtomicInteger<T>::store(T) [with T = int]’ is deprecated: Use storeRelaxed [-Wdeprecated-declarations]
qt3d/src/render/renderers/opengl/renderer/renderer_p.h:188:61: warning: ‘T QBasicAtomicInteger<T>::load() const [with T = int]’ is deprecated: Use loadRelaxed [-Wdeprecated-declarations]
Change-Id: Ica946808969e7f311c98e30d1a61c1b4fa22f66a
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/core/jobs')
| -rw-r--r-- | src/core/jobs/qthreadpooler.cpp | 2 | ||||
| -rw-r--r-- | src/core/jobs/task.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index 0e9af58dd..a9f4e7a31 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -183,7 +183,7 @@ int QThreadPooler::currentCount() const { // The caller have to set the mutex - return m_taskCount.load(); + return m_taskCount.loadRelaxed(); } int QThreadPooler::maxThreadCount() const diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp index 4291a4779..091aabfd6 100644 --- a/src/core/jobs/task.cpp +++ b/src/core/jobs/task.cpp @@ -118,7 +118,7 @@ void SyncTaskRunnable::run() m_atomicCount->deref(); // Wait for the other worker threads to be done - while (m_atomicCount->load() > 0) + while (m_atomicCount->loadRelaxed() > 0) QThread::currentThread()->yieldCurrentThread(); if (m_pooler) |