diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-17 14:35:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-17 14:39:30 (GMT) |
| commit | a444061bf8044776ae7266a2a9f63dc8eb534d79 (patch) | |
| tree | fac12687f8b5ea0b56f8a301539075e1922be861 /src | |
| parent | ed919d0be2e2f1c9df801e5c6649eed65595769e (diff) | |
| download | Qt-a444061bf8044776ae7266a2a9f63dc8eb534d79.zip Qt-a444061bf8044776ae7266a2a9f63dc8eb534d79.tar.gz Qt-a444061bf8044776ae7266a2a9f63dc8eb534d79.tar.bz2 | |
Fix compilation error with ARMv5 atomics when T is a const value.
Error was:
../../include/QtCore/../../src/corelib/arch/qatomic_armv5.h:301: error:
invalid conversion from 'const void*' to 'void*'
faba550d704312a29d9485bcaaa506331f102301 introduced the fix to 4.7,
but since the file was renamed in 4.8, the merge didn't apply. The
conflict resolution in 91efdcae was incomplete.
Reviewed-by: Harald Fernengel
Diffstat (limited to 'src')
| -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)) |