From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 18 Aug 2022 14:15:00 +0000 (-0400)
Subject: Revert "Fix: remove type constness in URCU_FORCE_CAST's C++ version"
X-Git-Tag: v0.13.2~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b17dfb9e6c93b38fcbe29fe45b3ec03b704facb5;p=userspace-rcu.git

Revert "Fix: remove type constness in URCU_FORCE_CAST's C++ version"

This reverts commit 342602dc6dc67d92a6f5ddcbe6ae407c87cb4c6b.

This adds a dependency on c++11, which is not present in the stable-0.13
branch README.md file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I8c586b03cb94fdb4f28ca7de254b1be4e2c48acd
---

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 2f32b38..34eb564 100644
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -21,10 +21,6 @@
 
 #include <stddef.h>	/* for offsetof */
 
-#if defined __cplusplus
-# include <type_traits>	/* 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<std::remove_cv<_type>::type>(arg))
+#define URCU_FORCE_CAST(type, arg)	(reinterpret_cast<type>(arg))
 #else
 #define URCU_FORCE_CAST(type, arg)	((type) (arg))
 #endif