X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Flfstack.h;h=0f4ee99d8c92a88d88d51fe47d36eb47275056fb;hp=43ef2a5ccad5b0b90ef38c818d691ccfee0e3476;hb=087bce43020d2b45dab2dd8ecd6b0d6949c626f3;hpb=2875743718fb23293190b5edd0f2b530977270b1

diff --git a/include/urcu/lfstack.h b/include/urcu/lfstack.h
index 43ef2a5..0f4ee99 100644
--- a/include/urcu/lfstack.h
+++ b/include/urcu/lfstack.h
@@ -29,7 +29,6 @@ extern "C" {
 
 #include <stdbool.h>
 #include <pthread.h>
-#include <urcu/compiler.h>
 
 /*
  * Lock-free stack.
@@ -81,16 +80,27 @@ struct cds_lfs_stack {
 };
 
 /*
- * The transparent union allows calling functions that work on both
- * struct cds_lfs_stack and struct __cds_lfs_stack on any of those two
- * types.
+ * In C, the transparent union allows calling functions that work on
+ * both struct cds_lfs_stack and struct __cds_lfs_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.
+ *
+ * Avoid complaints from clang++ not knowing the transparent union
+ * attribute.
  */
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-attributes"
+#endif
 typedef union {
 	struct __cds_lfs_stack *_s;
 	struct cds_lfs_stack *s;
-} caa_c_transparent_union cds_lfs_stack_ptr_t;
+} __attribute__((__transparent_union__)) cds_lfs_stack_ptr_t;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 #ifdef _LGPL_SOURCE
 
@@ -258,6 +268,49 @@ extern struct cds_lfs_head *__cds_lfs_pop_all(cds_lfs_stack_ptr_t s);
 
 #ifdef __cplusplus
 }
-#endif
+
+/*
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
+ */
+
+static inline cds_lfs_stack_ptr_t cds_lfs_stack_cast(struct __cds_lfs_stack *s)
+{
+	cds_lfs_stack_ptr_t ret = {
+		._s = s,
+	};
+	return ret;
+}
+
+static inline cds_lfs_stack_ptr_t cds_lfs_stack_cast(struct cds_lfs_stack *s)
+{
+	cds_lfs_stack_ptr_t ret = {
+		.s = s,
+	};
+	return ret;
+}
+
+template<typename T> static inline bool cds_lfs_empty(T s)
+{
+	return cds_lfs_empty(cds_lfs_stack_cast(s));
+}
+
+template<typename T> static inline bool cds_lfs_push(T s,
+			struct cds_lfs_node *node)
+{
+	return cds_lfs_push(cds_lfs_stack_cast(s), node);
+}
+
+template<typename T> static inline struct cds_lfs_node *__cds_lfs_pop(T s)
+{
+	return __cds_lfs_pop(cds_lfs_stack_cast(s));
+}
+
+template<typename T> static inline struct cds_lfs_head *__cds_lfs_pop_all(T s)
+{
+	return __cds_lfs_pop_all(cds_lfs_stack_cast(s));
+}
+
+#endif	/* __cplusplus */
 
 #endif /* _URCU_LFSTACK_H */