From 070e8aeccb9f9dbfed57245e78839eb181c66db5 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 18 Aug 2022 10:15:48 -0400 Subject: [PATCH] Revert "Fix: remove type constness in URCU_FORCE_CAST's C++ version" This reverts commit fa85464bb1e600910e24350188341be223621ba7. This adds a dependency on c++11, which is not present in the stable-0.12 branch README.md file. Signed-off-by: Mathieu Desnoyers --- include/urcu/compiler.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h index 255eae2..ddc29c3 100644 --- a/include/urcu/compiler.h +++ b/include/urcu/compiler.h @@ -21,10 +21,6 @@ #include /* for offsetof */ -#if defined __cplusplus -# include /* for std::remove_cv */ -#endif - #define caa_likely(x) __builtin_expect(!!(x), 1) #define caa_unlikely(x) __builtin_expect(!!(x), 0) @@ -86,7 +82,7 @@ #define __rcu #ifdef __cplusplus -#define URCU_FORCE_CAST(_type, arg) (reinterpret_cast::type>(arg)) +#define URCU_FORCE_CAST(type, arg) (reinterpret_cast(arg)) #else #define URCU_FORCE_CAST(type, arg) ((type) (arg)) #endif -- 2.34.1