summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2010-03-10 09:52:22 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2010-03-15 15:02:42 (GMT)
commitc63fe6fcfc83028419dd84d13d24e7cb1295ac7f (patch)
tree83f5a9d4b58044f22e3d937dfca6359d82bffeed /src/corelib/arch
parent6b55f2d1316e06e1cf075c5737ec54ba597f8426 (diff)
downloadQt-c63fe6fcfc83028419dd84d13d24e7cb1295ac7f.zip
Qt-c63fe6fcfc83028419dd84d13d24e7cb1295ac7f.tar.gz
Qt-c63fe6fcfc83028419dd84d13d24e7cb1295ac7f.tar.bz2
Compile on ARM with -Werror -Wold-style-cast
The C-style casts for the qt_atomic_eabi_cmpxchg_*() functions cause warnings when -Wold-style-cast is enabled. Use reinterpret_cast instead. Task-number: QTBUG-3933
Diffstat (limited to 'src/corelib/arch')
-rw-r--r--src/corelib/arch/qatomic_arm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
index 9d7e9c6..9df02a2 100644
--- a/src/corelib/arch/qatomic_arm.h
+++ b/src/corelib/arch/qatomic_arm.h
@@ -108,8 +108,8 @@ 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)(void *oldval, void *newval, volatile void *ptr);
-#define qt_atomic_eabi_cmpxchg_int (*(qt_atomic_eabi_cmpxchg_int_t *)0xffff0fc0)
-#define qt_atomic_eabi_cmpxchg_ptr (*(qt_atomic_eabi_cmpxchg_ptr_t *)0xffff0fc0)
+#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))
#else