X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fwfstack.h;h=5d58a9143ffb49eaaf6f2a1ad491aa34a81048d3;hb=c38fa0271a8c008d1bfa26cab674ee5ac9d6ac86;hp=1058fba9baa4dc0fa89b1250e68f5c2814e486e2;hpb=014775106c60f02818ca755b331f887030bd440f;p=urcu.git

diff --git a/include/urcu/wfstack.h b/include/urcu/wfstack.h
index 1058fba..5d58a91 100644
--- a/include/urcu/wfstack.h
+++ b/include/urcu/wfstack.h
@@ -57,7 +57,7 @@ extern "C" {
  * synchronization.
  */
 
-#define CDS_WFS_WOULDBLOCK	((void *) -1UL)
+#define CDS_WFS_WOULDBLOCK	((struct cds_wfs_node *) -1UL)
 
 enum cds_wfs_state {
 	CDS_WFS_STATE_LAST =		(1U << 0),
@@ -92,14 +92,17 @@ struct cds_wfs_stack {
 };
 
 /*
- * The transparent union allows calling functions that work on both
+ * In C, the transparent union allows calling functions that work on both
  * struct cds_wfs_stack and struct __cds_wfs_stack on any of those two
  * types.
+ *
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
  */
 typedef union {
 	struct __cds_wfs_stack *_s;
 	struct cds_wfs_stack *s;
-} __attribute__((__transparent_union__)) cds_wfs_stack_ptr_t;
+} caa_c_transparent_union cds_wfs_stack_ptr_t;
 
 #ifdef _LGPL_SOURCE
 
@@ -318,10 +321,6 @@ extern struct cds_wfs_head *__cds_wfs_pop_all(cds_wfs_stack_ptr_t u_stack);
 
 #endif /* !_LGPL_SOURCE */
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * cds_wfs_for_each_blocking: Iterate over all nodes returned by
  * __cds_wfs_pop_all().
@@ -353,4 +352,68 @@ extern struct cds_wfs_head *__cds_wfs_pop_all(cds_wfs_stack_ptr_t u_stack);
 		node != NULL;						   \
 		node = n, n = (node ? cds_wfs_next_blocking(node) : NULL))
 
+#ifdef __cplusplus
+}
+
+/*
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
+ */
+
+static inline cds_wfs_stack_ptr_t cds_wfs_stack_cast(struct __cds_wfs_stack *s)
+{
+	cds_wfs_stack_ptr_t ret = {
+		._s = s,
+	};
+	return ret;
+}
+
+static inline cds_wfs_stack_ptr_t cds_wfs_stack_cast(struct cds_wfs_stack *s)
+{
+	cds_wfs_stack_ptr_t ret = {
+		.s = s,
+	};
+	return ret;
+}
+
+template<typename T> static inline bool cds_wfs_empty(T s)
+{
+	return cds_wfs_empty(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline int cds_wfs_push(T s, struct cds_wfs_node *node)
+{
+	return cds_wfs_push(cds_wfs_stack_cast(s), node);
+}
+
+template<typename T> static inline struct cds_wfs_node *__cds_wfs_pop_blocking(T s)
+{
+	return __cds_wfs_pop_blocking(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline struct cds_wfs_node *
+	__cds_wfs_pop_with_state_blocking(T s, int *state)
+{
+	return __cds_wfs_pop_with_state_blocking(cds_wfs_stack_cast(s), state);
+}
+
+template<typename T> static inline struct cds_wfs_node *__cds_wfs_pop_nonblocking(T s)
+
+{
+	return __cds_wfs_pop_nonblocking(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline struct cds_wfs_node *
+	__cds_wfs_pop_with_state_nonblocking(T s, int *state)
+{
+	return __cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_cast(s), state);
+}
+
+template<typename T> static inline struct cds_wfs_head *__cds_wfs_pop_all(T s)
+{
+	return __cds_wfs_pop_all(cds_wfs_stack_cast(s));
+}
+
+#endif
+
 #endif /* _URCU_WFSTACK_H */