Merge pull request #2131 from geky/fix-core-util-atomic-incr-ptr

Fixed typo in incr/decr function
pull/2140/head
Martin Kojtal 2016-07-11 09:22:10 +01:00 committed by GitHub
commit 0b56c3e276
1 changed files with 16 additions and 14 deletions

View File

@ -232,12 +232,6 @@ bool core_util_atomic_cas_u32(uint32_t *ptr, uint32_t *expectedCurrentValue, uin
return success;
}
bool core_util_atomic_cas_ptr(void **ptr, void **expectedCurrentValue, void *desiredValue) {
return core_util_atomic_cas_u32(
(uintptr_t *)ptr,
(uintptr_t *)expectedCurrentValue,
(uintptr_t)desiredValue);
}
uint8_t core_util_atomic_incr_u8(uint8_t *valuePtr, uint8_t delta)
{
@ -269,10 +263,6 @@ uint32_t core_util_atomic_incr_u32(uint32_t *valuePtr, uint32_t delta)
return newValue;
}
void *core_util_atomic_incr_ptr(void **valuePtr, ptrdiff_t delta) {
return core_util_atomic_incr((uintptr_t)valuePtr, (uintptr_t)delta);
}
uint8_t core_util_atomic_decr_u8(uint8_t *valuePtr, uint8_t delta)
{
@ -304,9 +294,21 @@ uint32_t core_util_atomic_decr_u32(uint32_t *valuePtr, uint32_t delta)
return newValue;
}
void *core_util_atomic_decr_ptr(void **valuePtr, ptrdiff_t delta) {
return core_util_atomic_decr((uintptr_t)valuePtr, (uintptr_t)delta);
}
#endif
bool core_util_atomic_cas_ptr(void **ptr, void **expectedCurrentValue, void *desiredValue) {
return core_util_atomic_cas_u32(
(uint32_t *)ptr,
(uint32_t *)expectedCurrentValue,
(uint32_t)desiredValue);
}
void *core_util_atomic_incr_ptr(void **valuePtr, ptrdiff_t delta) {
return (void *)core_util_atomic_incr_u32((uint32_t *)valuePtr, (uint32_t)delta);
}
void *core_util_atomic_decr_ptr(void **valuePtr, ptrdiff_t delta) {
return (void *)core_util_atomic_decr_u32((uint32_t *)valuePtr, (uint32_t)delta);
}