X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Fwfstack.h;h=5d58a9143ffb49eaaf6f2a1ad491aa34a81048d3;hp=016d9f2207df89a37cca8d7ca49847b829c8bf23;hb=c38fa0271a8c008d1bfa26cab674ee5ac9d6ac86;hpb=2875743718fb23293190b5edd0f2b530977270b1

diff --git a/include/urcu/wfstack.h b/include/urcu/wfstack.h
index 016d9f2..5d58a91 100644
--- a/include/urcu/wfstack.h
+++ b/include/urcu/wfstack.h
@@ -92,11 +92,12 @@ 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.
  *
- * Avoid complaints from clang++ not knowing this attribute.
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
  */
 typedef union {
 	struct __cds_wfs_stack *_s;
@@ -320,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().
@@ -355,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 */