From abc8e871af6aa6aa1506ecbbd74b75389660f7cc Mon Sep 17 00:00:00 2001 From: Michael Haberler Date: Sun, 9 Aug 2015 20:07:00 +0200 Subject: [PATCH] arm/c++: cast arguments using CK_CPP_CAST --- include/gcc/arm/ck_pr.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/gcc/arm/ck_pr.h b/include/gcc/arm/ck_pr.h index efa6638..3fb303a 100644 --- a/include/gcc/arm/ck_pr.h +++ b/include/gcc/arm/ck_pr.h @@ -217,12 +217,15 @@ ck_pr_cas_64_value(uint64_t *target, uint64_t compare, uint64_t set, uint64_t *v CK_CC_INLINE static bool ck_pr_cas_ptr_2_value(void *target, void *compare, void *set, void *value) { - uint32_t *_compare = compare; - uint32_t *_set = set; + uint32_t *_compare = CK_CPP_CAST(uint32_t *, compare); + uint32_t *_set = CK_CPP_CAST(uint32_t *, set); uint64_t __compare = ((uint64_t)_compare[0]) | ((uint64_t)_compare[1] << 32); uint64_t __set = ((uint64_t)_set[0]) | ((uint64_t)_set[1] << 32); - return (ck_pr_cas_64_value(target, __compare, __set, value)); + return (ck_pr_cas_64_value(CK_CPP_CAST(uint64_t *, target), + __compare, + __set, + CK_CPP_CAST(uint64_t *, value))); } @@ -253,11 +256,13 @@ ck_pr_cas_64(uint64_t *target, uint64_t compare, uint64_t set) CK_CC_INLINE static bool ck_pr_cas_ptr_2(void *target, void *compare, void *set) { - uint32_t *_compare = compare; - uint32_t *_set = set; + uint32_t *_compare = CK_CPP_CAST(uint32_t *, compare); + uint32_t *_set = CK_CPP_CAST(uint32_t *, set); uint64_t __compare = ((uint64_t)_compare[0]) | ((uint64_t)_compare[1] << 32); uint64_t __set = ((uint64_t)_set[0]) | ((uint64_t)_set[1] << 32); - return (ck_pr_cas_64(target, __compare, __set)); + return (ck_pr_cas_64(CK_CPP_CAST(uint64_t *, target), + __compare, + __set)); } #endif