From: Ivan Maidanski Date: Sun, 13 Jan 2013 18:42:52 +0000 (+0400) Subject: Fix return type of AO_int_X primitives defined in ao_t_is_int header X-Git-Tag: libatomic_ops-7_4_0~48^2~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e9fc4f49e415dd892b3749913e40ea768df13fc;p=libatomic_ops Fix return type of AO_int_X primitives defined in ao_t_is_int header * src/atomic_ops/sysdeps/ao_t_is_int.h (AO_int_fetch_compare_and_swap_full, AO_int_fetch_compare_and_swap_acquire, AO_int_fetch_compare_and_swap_release, AO_int_fetch_compare_and_swap_write, AO_int_fetch_compare_and_swap_read, AO_int_fetch_compare_and_swap, AO_int_load_acquire, AO_int_fetch_and_add_full, AO_int_fetch_and_add1_acquire, AO_int_fetch_and_add1_release, AO_int_fetch_and_sub1_acquire, AO_int_fetch_and_sub1_release): Cast result to unsigned int instead of signed int. --- diff --git a/src/atomic_ops/sysdeps/ao_t_is_int.h b/src/atomic_ops/sysdeps/ao_t_is_int.h index abf7406..8ec47ef 100644 --- a/src/atomic_ops/sysdeps/ao_t_is_int.h +++ b/src/atomic_ops/sysdeps/ao_t_is_int.h @@ -76,43 +76,43 @@ #if defined(AO_HAVE_fetch_compare_and_swap_full) \ && !defined(AO_HAVE_int_fetch_compare_and_swap_full) # define AO_int_fetch_compare_and_swap_full(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap_full((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap_full((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap_full #endif #if defined(AO_HAVE_fetch_compare_and_swap_acquire) \ && !defined(AO_HAVE_int_fetch_compare_and_swap_acquire) # define AO_int_fetch_compare_and_swap_acquire(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap_acquire((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap_acquire((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap_acquire #endif #if defined(AO_HAVE_fetch_compare_and_swap_release) \ && !defined(AO_HAVE_int_fetch_compare_and_swap_release) # define AO_int_fetch_compare_and_swap_release(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap_release((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap_release((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap_release #endif #if defined(AO_HAVE_fetch_compare_and_swap_write) \ && !defined(AO_HAVE_int_fetch_compare_and_swap_write) # define AO_int_fetch_compare_and_swap_write(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap_write((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap_write((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap_write #endif #if defined(AO_HAVE_fetch_compare_and_swap_read) \ && !defined(AO_HAVE_int_fetch_compare_and_swap_read) # define AO_int_fetch_compare_and_swap_read(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap_read((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap_read((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap_read #endif #if defined(AO_HAVE_fetch_compare_and_swap) \ && !defined(AO_HAVE_int_fetch_compare_and_swap) # define AO_int_fetch_compare_and_swap(addr, old, new_val) \ - ((int)AO_fetch_compare_and_swap((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val))) + ((unsigned)AO_fetch_compare_and_swap((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val))) # define AO_HAVE_int_fetch_compare_and_swap #endif @@ -120,7 +120,7 @@ #if defined(AO_HAVE_load_acquire) \ && !defined(AO_HAVE_int_load_acquire) # define AO_int_load_acquire(addr) \ - (int)AO_load_acquire((const volatile AO_t *)(addr)) + (unsigned)AO_load_acquire((const volatile AO_t *)(addr)) # define AO_HAVE_int_load_acquire #endif @@ -136,7 +136,7 @@ #if defined(AO_HAVE_fetch_and_add_full) \ && !defined(AO_HAVE_int_fetch_and_add_full) # define AO_int_fetch_and_add_full(addr, incr) \ - (int)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr)) + (unsigned)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr)) # define AO_HAVE_int_fetch_and_add_full #endif @@ -144,13 +144,13 @@ #if defined(AO_HAVE_fetch_and_add1_acquire) \ && !defined(AO_HAVE_int_fetch_and_add1_acquire) # define AO_int_fetch_and_add1_acquire(addr) \ - (int)AO_fetch_and_add1_acquire((volatile AO_t *)(addr)) + (unsigned)AO_fetch_and_add1_acquire((volatile AO_t *)(addr)) # define AO_HAVE_int_fetch_and_add1_acquire #endif #if defined(AO_HAVE_fetch_and_add1_release) \ && !defined(AO_HAVE_int_fetch_and_add1_release) # define AO_int_fetch_and_add1_release(addr) \ - (int)AO_fetch_and_add1_release((volatile AO_t *)(addr)) + (unsigned)AO_fetch_and_add1_release((volatile AO_t *)(addr)) # define AO_HAVE_int_fetch_and_add1_release #endif @@ -158,12 +158,12 @@ #if defined(AO_HAVE_fetch_and_sub1_acquire) \ && !defined(AO_HAVE_int_fetch_and_sub1_acquire) # define AO_int_fetch_and_sub1_acquire(addr) \ - (int)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr)) + (unsigned)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr)) # define AO_HAVE_int_fetch_and_sub1_acquire #endif #if defined(AO_HAVE_fetch_and_sub1_release) \ && !defined(AO_HAVE_int_fetch_and_sub1_release) # define AO_int_fetch_and_sub1_release(addr) \ - (int)AO_fetch_and_sub1_release((volatile AO_t *)(addr)) + (unsigned)AO_fetch_and_sub1_release((volatile AO_t *)(addr)) # define AO_HAVE_int_fetch_and_sub1_release #endif