diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2019-06-24 15:46:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 21:06:19 +0000 |
| commit | c060f6e765a2f155b38158f2ed73eac4aad37e02 (patch) | |
| tree | 2cb7b1d9752b607bd4f55d4f14a4e6d5aa094e34 /src/qml/qml/qqmltypeloader.cpp | |
| parent | b1f238568214e6587b829d6695677e55a99b1d40 (diff) | |
Port towards load/storeRelaxed atomics
Plain load() / store() have been deprecated, so port away
to their straight replacements.
Task-number: QTBUG-76611
Change-Id: I79935b889cf7b2ba7698f70cc5e33994b034aa09
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 15a9c30c28..0bfdbdd2fa 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -756,13 +756,13 @@ QQmlDataBlob::ThreadData::ThreadData() QQmlDataBlob::Status QQmlDataBlob::ThreadData::status() const { - return QQmlDataBlob::Status((_p.load() & TD_STATUS_MASK) >> TD_STATUS_SHIFT); + return QQmlDataBlob::Status((_p.loadRelaxed() & TD_STATUS_MASK) >> TD_STATUS_SHIFT); } void QQmlDataBlob::ThreadData::setStatus(QQmlDataBlob::Status status) { while (true) { - int d = _p.load(); + int d = _p.loadRelaxed(); int nd = (d & ~TD_STATUS_MASK) | ((status << TD_STATUS_SHIFT) & TD_STATUS_MASK); if (d == nd || _p.testAndSetOrdered(d, nd)) return; } @@ -770,13 +770,13 @@ void QQmlDataBlob::ThreadData::setStatus(QQmlDataBlob::Status status) bool QQmlDataBlob::ThreadData::isAsync() const { - return _p.load() & TD_ASYNC_MASK; + return _p.loadRelaxed() & TD_ASYNC_MASK; } void QQmlDataBlob::ThreadData::setIsAsync(bool v) { while (true) { - int d = _p.load(); + int d = _p.loadRelaxed(); int nd = (d & ~TD_ASYNC_MASK) | (v?TD_ASYNC_MASK:0); if (d == nd || _p.testAndSetOrdered(d, nd)) return; } @@ -784,13 +784,13 @@ void QQmlDataBlob::ThreadData::setIsAsync(bool v) quint8 QQmlDataBlob::ThreadData::progress() const { - return quint8((_p.load() & TD_PROGRESS_MASK) >> TD_PROGRESS_SHIFT); + return quint8((_p.loadRelaxed() & TD_PROGRESS_MASK) >> TD_PROGRESS_SHIFT); } void QQmlDataBlob::ThreadData::setProgress(quint8 v) { while (true) { - int d = _p.load(); + int d = _p.loadRelaxed(); int nd = (d & ~TD_PROGRESS_MASK) | ((v << TD_PROGRESS_SHIFT) & TD_PROGRESS_MASK); if (d == nd || _p.testAndSetOrdered(d, nd)) return; } |