diff options
| author | Tomasz Duda <tomaszduda23@gmail.com> | 2012-11-19 16:31:47 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 23:20:04 (GMT) |
| commit | 481ab62f821c70984df39880497da920e7a226e6 (patch) | |
| tree | a9ba1ad3f7e15ef6d284f005852232c707c74a03 /src | |
| parent | ad601ceb3b953c042c70b462605f87c84b7179a6 (diff) | |
| download | Qt-481ab62f821c70984df39880497da920e7a226e6.zip Qt-481ab62f821c70984df39880497da920e7a226e6.tar.gz Qt-481ab62f821c70984df39880497da920e7a226e6.tar.bz2 | |
Add missing fields for atomic classes in ARMv5 OABI.
In commit Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf I forgot
about two local fields for QBasicAtomicPointer and QBasicAtomicInt.
Change-Id: I10637a4c85319ee16a8ea610840d31f331575267
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/arch/qatomic_armv5.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index 58af413..e3acd12 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -232,6 +232,7 @@ inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) : "r"(newValue), "r"(&_q_value) : "cc", "memory"); #else + int count = 0; while (q_atomic_swp(&q_atomic_lock, ~0) != 0) qt_atomic_yield(&count); originalValue=_q_value; @@ -369,6 +370,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) : "r"(newValue), "r"(&_q_value) : "cc", "memory"); #else + int count = 0; while (q_atomic_swp(&q_atomic_lock, ~0) != 0) qt_atomic_yield(&count); originalValue=_q_value; |