projects
/
userspace-rcu.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
[userspace-rcu.git]
/
include
/
urcu
/
compiler.h
diff --git
a/include/urcu/compiler.h
b/include/urcu/compiler.h
index 157346763078a3ec1d73b7c65618ed1bd98b325f..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
@@
-119,10
+123,4
@@
+ __GNUC_PATCHLEVEL__)
#endif
+ __GNUC_PATCHLEVEL__)
#endif
-#ifndef __cplusplus
-#define caa_c_transparent_union __attribute__((__transparent_union__))
-#else
-#define caa_c_transparent_union
-#endif
-
#endif /* _URCU_COMPILER_H */
#endif /* _URCU_COMPILER_H */
This page took
0.024906 seconds
and
4
git commands to generate.