X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Flfstack.h;fp=include%2Furcu%2Flfstack.h;h=b0441325a2ff9c9568dab455d10ccfccee496233;hp=43ef2a5ccad5b0b90ef38c818d691ccfee0e3476;hb=e93490203293561d8f1366fa515eeefd5728e53d;hpb=95720c6db3b4b2721c71fbb844b3f597fe4a81d0

diff --git a/include/urcu/lfstack.h b/include/urcu/lfstack.h
index 43ef2a5..b044132 100644
--- a/include/urcu/lfstack.h
+++ b/include/urcu/lfstack.h
@@ -81,11 +81,12 @@ 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.
  */
 typedef union {
 	struct __cds_lfs_stack *_s;
@@ -258,6 +259,70 @@ 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;
+}
+
+static inline bool cds_lfs_empty(struct __cds_lfs_stack *_s)
+{
+	return cds_lfs_empty(__cds_lfs_stack_cast(_s));
+}
+
+static inline bool cds_lfs_empty(struct cds_lfs_stack *s)
+{
+	return cds_lfs_empty(cds_lfs_stack_cast(s));
+}
+
+static inline bool cds_lfs_push(struct __cds_lfs_stack *s,
+			struct cds_lfs_node *node)
+{
+	return cds_lfs_push(__cds_lfs_stack_cast(s), node);
+}
+
+static inline bool cds_lfs_push(struct cds_lfs_stack *s,
+			struct cds_lfs_node *node)
+{
+	return cds_lfs_push(cds_lfs_stack_cast(s), node);
+}
+
+static inline struct cds_lfs_node *__cds_lfs_pop(struct __cds_lfs_stack *s)
+{
+	return __cds_lfs_pop(__cds_lfs_stack_cast(s));
+}
+
+static inline struct cds_lfs_node *__cds_lfs_pop(struct cds_lfs_stack *s)
+{
+	return __cds_lfs_pop(cds_lfs_stack_cast(s));
+}
+
+static inline struct cds_lfs_head *__cds_lfs_pop_all(struct __cds_lfs_stack *s)
+{
+	return __cds_lfs_pop_all(__cds_lfs_stack_cast(s));
+}
+
+static inline struct cds_lfs_head *__cds_lfs_pop_all(struct cds_lfs_stack *s)
+{
+	return __cds_lfs_pop_all(cds_lfs_stack_cast(s));
+}
+
+#endif	/* __cplusplus */
 
 #endif /* _URCU_LFSTACK_H */