projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: remove type constness in URCU_FORCE_CAST's C++ version
[urcu.git]
/
include
/
urcu
/
compiler.h
diff --git
a/include/urcu/compiler.h
b/include/urcu/compiler.h
index 4806ee338a99706ae5bb9eedb503fdc54e00c661..2f32b38d6fb1850291ebd500f0a2fdca53f5c428 100644
(file)
--- a/
include/urcu/compiler.h
+++ b/
include/urcu/compiler.h
@@
-21,6
+21,10
@@
#include <stddef.h> /* for offsetof */
#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)
#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 __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
#else
#define URCU_FORCE_CAST(type, arg) ((type) (arg))
#endif
@@
-108,7
+112,12
@@
#define CAA_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define CAA_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#ifdef __GNUC__
+/*
+ * 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.
+ */
+#if defined(__GNUC__) && !defined(__clang__)
# define URCU_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
# define URCU_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
This page took
0.024472 seconds
and
4
git commands to generate.