X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=f977b95fdc60f73b6ef6c9ab2b96c4c30a884de2;hp=4bced2a9849846a25b8c1fd59a15cd2b03af0060;hb=125f41dbd49567662fe7f0b3105d8f2c4b73e535;hpb=92cfe223501f564d3bd726a6c580702daeef4198

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 4bced2a..f977b95 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -20,8 +20,8 @@
 
 #include <stddef.h>	/* for offsetof */
 
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
+#define caa_likely(x)	__builtin_expect(!!(x), 1)
+#define caa_unlikely(x)	__builtin_expect(!!(x), 0)
 
 #define	cmm_barrier()	asm volatile("" : : : "memory")
 
@@ -79,4 +79,10 @@
  */
 #define __rcu
 
+#ifdef __cplusplus
+#define URCU_FORCE_CAST(type, arg)	(reinterpret_cast<type>(arg))
+#else
+#define URCU_FORCE_CAST(type, arg)	((type) (arg))
+#endif
+
 #endif /* _URCU_COMPILER_H */