X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fcompiler.h;fp=include%2Furcu%2Fcompiler.h;h=255eae294fac205113833a52369d52ea66f5276c;hb=fa85464bb1e600910e24350188341be223621ba7;hp=ddc29c35543d4fe75d8a15ea1ad704e5acd100f2;hpb=bf178c7f5ab7ef4cc0d6dca6195af387281d44af;p=urcu.git

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index ddc29c3..255eae2 100644
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -21,6 +21,10 @@
 
 #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)
 
@@ -82,7 +86,7 @@
 #define __rcu
 
 #ifdef __cplusplus
-#define URCU_FORCE_CAST(type, arg)	(reinterpret_cast<type>(arg))
+#define URCU_FORCE_CAST(_type, arg)	(reinterpret_cast<std::remove_cv<_type>::type>(arg))
 #else
 #define URCU_FORCE_CAST(type, arg)	((type) (arg))
 #endif