1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Deprecate QAtomic::load() / store()""

Browse Source 
This reverts commit 5859f7d0d9440f82086486639a707f3935696cf4.

Reason for revert: the blocker for qtdeclarative has been merged
(in qtdeclarative/c060f6e765a2f155b38158f2ed73eac4aad37e02).

Change-Id: Ie69cb1567417173f543e88f659658fe03ba28830
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2019-07-01 18:23:10 +00:00 committed by Liang Qi
parent 6f8fc4217a
commit 5f3bbd0cf0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/thread/qbasicatomic.h
View File

@ -99,8 +99,10 @@ public:
typename Ops::Type _q_value; typename Ops::Type _q_value;
// Everything below is either implemented in ../arch/qatomic_XXX.h or (as fallback) in qgenericatomic.h // Everything below is either implemented in ../arch/qatomic_XXX.h or (as fallback) in qgenericatomic.h
T load() const noexcept { return loadRelaxed(); } #if QT_DEPRECATED_SINCE(5, 14)
void store(T newValue) noexcept { storeRelaxed(newValue); } QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") T load() const noexcept { return loadRelaxed(); }
QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(T newValue) noexcept { storeRelaxed(newValue); }
#endif
T loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); } T loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
void storeRelaxed(T newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); } void storeRelaxed(T newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }
@ -238,8 +240,10 @@ public:
AtomicType _q_value; AtomicType _q_value;
Type load() const noexcept { return loadRelaxed(); } #if QT_DEPRECATED_SINCE(5, 14)
void store(Type newValue) noexcept { storeRelaxed(newValue); } QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") Type load() const noexcept { return loadRelaxed(); }
QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(Type newValue) noexcept { storeRelaxed(newValue); }
#endif
Type loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); } Type loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); } void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }