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

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 511dbdf..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
@@ -110,9 +114,13 @@
 
 /*
  * Don't allow compiling with buggy compiler.
+ *
+ * URCU_GCC_VERSION is used to blacklist specific GCC versions with known
+ * bugs, clang also defines these macros to an equivalent GCC version it
+ * claims to support, so exclude it.
  */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 # define URCU_GCC_VERSION	(__GNUC__ * 10000 \
 				+ __GNUC_MINOR__ * 100 \
 				+ __GNUC_PATCHLEVEL__)