diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 21:07:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 21:07:28 (GMT) |
| commit | a4fbc44f0b29ae7c8bb0fc85af2cd56244889464 (patch) | |
| tree | 91a6d16ff602b5b27c12974db3d9ebff3b5feeb5 /src/corelib | |
| parent | 210a6998d9d3e9334bab13c23e8b98c0fc0abccb (diff) | |
| parent | a444061bf8044776ae7266a2a9f63dc8eb534d79 (diff) | |
| download | Qt-a4fbc44f0b29ae7c8bb0fc85af2cd56244889464.zip Qt-a4fbc44f0b29ae7c8bb0fc85af2cd56244889464.tar.gz Qt-a4fbc44f0b29ae7c8bb0fc85af2cd56244889464.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation error with ARMv5 atomics when T is a const value.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/qatomic_armv5.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index f0f2f9a..820be7b 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -107,7 +107,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() // kernel places a restartable cmpxchg implementation at a fixed address extern "C" typedef int (qt_atomic_eabi_cmpxchg_int_t)(int oldval, int newval, volatile int *ptr); -extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, void *newval, volatile void *ptr); +extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, const void *newval, volatile void *ptr); #define qt_atomic_eabi_cmpxchg_int (*reinterpret_cast<qt_atomic_eabi_cmpxchg_int_t *>(0xffff0fc0)) #define qt_atomic_eabi_cmpxchg_ptr (*reinterpret_cast<qt_atomic_eabi_cmpxchg_ptr_t *>(0xffff0fc0)) |