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 <mathieu.desnoyers@efficios.com>

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 255eae294fac205113833a52369d52ea66f5276c..ddc29c35543d4fe75d8a15ea1ad704e5acd100f2 100644 (file)
--- 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