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

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 511dbdf..827ec1f 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
@@ -109,22 +113,40 @@
 #define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
 
 /*
- * 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__)
+#endif
+
+#ifdef __cplusplus
+#define caa_unqual_scalar_typeof(x)					\
+	std::remove_cv<std::remove_reference<decltype(x)>::type>::type
+#else
+#define caa_scalar_type_to_expr(type)					\
+	unsigned type: (unsigned type)0,				\
+	signed type: (signed type)0
 
 /*
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
+ * Use C11 _Generic to express unqualified type from expression. This removes
+ * volatile qualifier from expression type.
  */
-# ifdef __ARMEL__
-#  if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802
-#   error Your gcc version produces clobbered frame accesses
-#  endif
-# endif
+#define caa_unqual_scalar_typeof(x)					\
+	__typeof__(							\
+		_Generic((x),						\
+			char: (char)0,					\
+			caa_scalar_type_to_expr(char),			\
+			caa_scalar_type_to_expr(short),		\
+			caa_scalar_type_to_expr(int),			\
+			caa_scalar_type_to_expr(long),			\
+			caa_scalar_type_to_expr(long long),		\
+			default: (x)					\
+		)							\
+	)
 #endif
 
 #endif /* _URCU_COMPILER_H */