X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer.h;h=027a18fd4d0b57159a096e5a575d1618ddcfe364;hp=0a3524fa1e0b7b65cd6ec8154c9a45b2bf36abb5;hb=a2e7bf9ce5de5113c7f59c380b0087e291cd603d;hpb=b1048d48b166d50e10d1eb3a1e512a7bffb2a265

diff --git a/urcu-pointer.h b/urcu-pointer.h
index 0a3524f..027a18f 100644
--- a/urcu-pointer.h
+++ b/urcu-pointer.h
@@ -6,7 +6,7 @@
  *
  * Userspace RCU header. Operations on pointers.
  *
- * 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
@@ -28,11 +28,15 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-pointer-static.h>
+#include <urcu/static/urcu-pointer.h>
 
 /*
  * rcu_dereference(ptr)
@@ -60,21 +64,41 @@
 
 #else /* !_LGPL_SOURCE */
 
-extern void *rcu_dereference(void *p);
+extern void *rcu_dereference_sym(void *p);
+#define rcu_dereference(p)						     \
+	({								     \
+		typeof(p) _________p1 =					     \
+			rcu_dereference_sym((void *)(p));		     \
+		(_________p1);						     \
+	})
 
 extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new);
-#define rcu_cmpxchg_pointer(p, old, _new)		\
-	rcu_cmpxchg_pointer_sym((void **)(p), (old), (_new))
+#define rcu_cmpxchg_pointer(p, old, _new)				     \
+	({								     \
+		typeof(*p) _________pold = (old);			     \
+		typeof(*p) _________pnew = (_new);			     \
+		typeof(*p) _________p1 =				     \
+			rcu_cmpxchg_pointer_sym((void **)(p), _________pold, \
+						_________pnew);		     \
+		(_________p1);						     \
+	})
 
 extern void *rcu_xchg_pointer_sym(void **p, void *v);
-#define rcu_xchg_pointer(p, v)				\
-	rcu_xchg_pointer_sym((void **)(p), (v))
+#define rcu_xchg_pointer(p, v)						     \
+	({								     \
+		typeof(*p) _________pv = (v);			             \
+		typeof(*p) _________p1 =				     \
+			rcu_xchg_pointer_sym((void **)(p), _________pv);     \
+		(_________p1);						     \
+	})
 
 extern void *rcu_set_pointer_sym(void **p, void *v);
-#define rcu_set_pointer(p, v)				\
-	rcu_set_pointer_sym((void **)(p), (v))
-
-extern void *rcu_assign_pointer_sym(void **p, void *v);
+#define rcu_set_pointer(p, v)						     \
+	({								     \
+		typeof(*p) _________pv = (v);			             \
+		typeof(*p) _________p1 =				     \
+			rcu_set_pointer_sym((void **)(p), _________pv);	     \
+	})
 
 #endif /* !_LGPL_SOURCE */
 
@@ -87,4 +111,8 @@ extern void *rcu_assign_pointer_sym(void **p, void *v);
  */
 #define rcu_assign_pointer(p, v)	rcu_set_pointer((&p), (v))
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_POINTER_H */