From 8108650b24adbe03543eb29015ea9bda86d0068e Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Sat, 3 Mar 2012 20:26:47 -0800 Subject: Fix signature of q_atomic_test_and_set_ptr. The lack of const results in a compile error when compiling 32-bit Qt in a 64-bit machine (-platform linux-g++-32 -xplatform linux-g++-32). Adding const is safe since expected and newval parameters are not modified by qatomic_i386.s. Task-Number: QTBUG-22479 Change-Id: Iee9f73b9bed777177aeae34bfcedb2feac83e67a Reviewed-by: Thiago Macieira --- src/corelib/arch/qatomic_i386.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/arch/qatomic_i386.h b/src/corelib/arch/qatomic_i386.h index 53a8186..8e68b31 100644 --- a/src/corelib/arch/qatomic_i386.h +++ b/src/corelib/arch/qatomic_i386.h @@ -202,7 +202,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueTo extern "C" { Q_CORE_EXPORT int q_atomic_test_and_set_int(volatile int *ptr, int expected, int newval); - Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval); + Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, const void *expected, const void *newval); Q_CORE_EXPORT int q_atomic_increment(volatile int *ptr); Q_CORE_EXPORT int q_atomic_decrement(volatile int *ptr); Q_CORE_EXPORT int q_atomic_set_int(volatile int *ptr, int newval); -- cgit v0.12