diff options
| author | João Abecasis <joao@abecasis.name> | 2009-09-02 11:06:27 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2009-09-02 12:00:02 (GMT) |
| commit | d7bfe662bbbfe155a37f506d9cf4aa75385113bf (patch) | |
| tree | 863fff54ef550914b7f11c14b4c31ff740cdd414 /src/corelib | |
| parent | fef5f0fda91f36a9be0394d555c124abf13d672d (diff) | |
| download | Qt-d7bfe662bbbfe155a37f506d9cf4aa75385113bf.zip Qt-d7bfe662bbbfe155a37f506d9cf4aa75385113bf.tar.gz Qt-d7bfe662bbbfe155a37f506d9cf4aa75385113bf.tar.bz2 | |
Fixing compilation issues on Windows 64-bit
Reviewed-by: Trond Kjernåsen
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/qatomic_windows.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h index 9b7ff5d..6082d0b 100644 --- a/src/corelib/arch/qatomic_windows.h +++ b/src/corelib/arch/qatomic_windows.h @@ -144,7 +144,6 @@ extern "C" { #endif // QT_INTERLOCKED_DECLARE_PROTOTYPES #undef QT_INTERLOCKED_PROTOTYPE -#undef QT_INTERLOCKED_VOLATILE //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -215,13 +214,13 @@ extern "C" { # define QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(value, newValue, expectedValue) \ QT_INTERLOCKED_FUNCTION(InterlockedCompareExchangePointer)( \ - QT_INTERLOCKED_REMOVE_VOLATILE( value ), \ + reinterpret_cast<void * QT_INTERLOCKED_VOLATILE *>( QT_INTERLOCKED_REMOVE_VOLATILE( value ) ), \ newValue, \ expectedValue ) # define QT_INTERLOCKED_EXCHANGE_POINTER(value, newValue) \ QT_INTERLOCKED_FUNCTION(InterlockedExchangePointer)( \ - QT_INTERLOCKED_REMOVE_VOLATILE( value ), \ + reinterpret_cast<void * QT_INTERLOCKED_VOLATILE *>( QT_INTERLOCKED_REMOVE_VOLATILE( value ) ), \ newValue ) # define QT_INTERLOCKED_EXCHANGE_ADD_POINTER(value, valueToAdd) \ @@ -471,6 +470,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo #undef QT_INTERLOCKED_PREFIX #undef QT_INTERLOCKED_NO_VOLATILE +#undef QT_INTERLOCKED_VOLATILE #undef QT_INTERLOCKED_REMOVE_VOLATILE #undef QT_INTERLOCKED_INCREMENT |