X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer-static.h;h=093630a084f84ba7c5917a5621ee3fe1de3af258;hp=c0533c9d3281af0f613e7490ce18e67594bf75e4;hb=0ecb3fde04135d76545ce55d80abea9aef465b54;hpb=e156285068a631eaafa643d9e930b31780468d00

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index c0533c9..093630a 100644
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -34,6 +34,10 @@
 #include <urcu/system.h>
 #include <urcu/uatomic_arch.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 /**
  * _rcu_dereference - reads (copy) a RCU-protected pointer to a local variable
  * into a RCU read-side critical section. The pointer can later be safely
@@ -78,10 +82,7 @@
 		if (!__builtin_constant_p(_new) ||			\
 		    ((_new) != NULL))					\
 			wmb();						\
-		(likely(URCU_CAS_AVAIL()) ?				\
-			(uatomic_cmpxchg(p, _________pold, _________pnew)) : \
-			(compat_uatomic_cmpxchg(p, _________pold,	\
-						_________pnew)))	\
+		uatomic_cmpxchg(p, _________pold, _________pnew);	\
 	})
 
 /**
@@ -106,7 +107,7 @@
 		if (!__builtin_constant_p(v) || 	\
 		    ((v) != NULL))			\
 			wmb();				\
-		STORE_SHARED(*(p), _________pv);	\
+		uatomic_set(p, _________pv);		\
 	})
 
 /**
@@ -124,4 +125,8 @@
 
 #define _rcu_assign_pointer(p, v)	_rcu_set_pointer(&(p), v)
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_POINTER_STATIC_H */