diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 00:45:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 00:45:50 (GMT) |
| commit | 5346edef00dd8f541f16217e0960fd6bb4ea0981 (patch) | |
| tree | e28610b432e8d9ab3b3c717ad6c1a5c75ebd10ee | |
| parent | eccddae15a5e675e3b72a72b10457a5e9ea340b7 (diff) | |
| parent | d59eaf1c550d45ff1009ccceaea6298b9e3d8e2b (diff) | |
| download | Qt-5346edef00dd8f541f16217e0960fd6bb4ea0981.zip Qt-5346edef00dd8f541f16217e0960fd6bb4ea0981.tar.gz Qt-5346edef00dd8f541f16217e0960fd6bb4ea0981.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation on IA-64 with the Intel compiler: cast properly.
| -rw-r--r-- | src/corelib/arch/qatomic_ia64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index e015863..8c824f3 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -205,7 +205,7 @@ inline bool QBasicAtomicInt::deref() template <typename T> Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue) { - return (T *)_InterlockedExchangePointer(&_q_value, newValue); + return (T *)_InterlockedExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), newValue); } template <typename T> |