X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer-static.h;h=983d0d5bf429248be1905cfcce8d1e81a9dcaf9d;hp=0a01f1ffc944550d3c66cdf9b8d5a53c2a5c8225;hb=6982d6d71aeed16d2d929bd0ed221e8f444b706e;hpb=2b5554c9169ea1ef93dffacb7671a00f9e7de511

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index 0a01f1f..983d0d5 100644
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-pointer.h for
  * linking dynamically with the userspace rcu library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -32,7 +32,11 @@
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/system.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic_arch.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 /**
  * _rcu_dereference - reads (copy) a RCU-protected pointer to a local variable
@@ -103,7 +107,7 @@
 		if (!__builtin_constant_p(v) || 	\
 		    ((v) != NULL))			\
 			wmb();				\
-		STORE_SHARED(*(p), _________pv);	\
+		uatomic_set(p, _________pv);		\
 	})
 
 /**
@@ -121,4 +125,8 @@
 
 #define _rcu_assign_pointer(p, v)	_rcu_set_pointer(&(p), v)
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_POINTER_STATIC_H */