From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 8 Sep 2021 19:57:49 +0000 (-0400)
Subject: lfstack: combine C++ API cds_lfs_stack_cast with overloading
X-Git-Tag: v0.14.0~56
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3a602ac18a22ce6ab47040aaeaf2bca2dc30d20a;p=userspace-rcu.git

lfstack: combine C++ API cds_lfs_stack_cast with overloading

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I8d9cf79a320f057176972de11e1847076ddb1330
---

diff --git a/include/urcu/lfstack.h b/include/urcu/lfstack.h
index b044132..3b5034f 100644
--- a/include/urcu/lfstack.h
+++ b/include/urcu/lfstack.h
@@ -265,7 +265,7 @@ extern struct cds_lfs_head *__cds_lfs_pop_all(cds_lfs_stack_ptr_t s);
  * to obtain an API similar to C.
  */
 
-static inline cds_lfs_stack_ptr_t __cds_lfs_stack_cast(struct __cds_lfs_stack *s)
+static inline cds_lfs_stack_ptr_t cds_lfs_stack_cast(struct __cds_lfs_stack *s)
 {
 	cds_lfs_stack_ptr_t ret = {
 		._s = s,
@@ -281,9 +281,9 @@ static inline cds_lfs_stack_ptr_t cds_lfs_stack_cast(struct cds_lfs_stack *s)
 	return ret;
 }
 
-static inline bool cds_lfs_empty(struct __cds_lfs_stack *_s)
+static inline bool cds_lfs_empty(struct __cds_lfs_stack *s)
 {
-	return cds_lfs_empty(__cds_lfs_stack_cast(_s));
+	return cds_lfs_empty(cds_lfs_stack_cast(s));
 }
 
 static inline bool cds_lfs_empty(struct cds_lfs_stack *s)
@@ -294,7 +294,7 @@ static inline bool cds_lfs_empty(struct cds_lfs_stack *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);
+	return cds_lfs_push(cds_lfs_stack_cast(s), node);
 }
 
 static inline bool cds_lfs_push(struct cds_lfs_stack *s,
@@ -305,7 +305,7 @@ static inline bool cds_lfs_push(struct cds_lfs_stack *s,
 
 static inline struct cds_lfs_node *__cds_lfs_pop(struct __cds_lfs_stack *s)
 {
-	return __cds_lfs_pop(__cds_lfs_stack_cast(s));
+	return __cds_lfs_pop(cds_lfs_stack_cast(s));
 }
 
 static inline struct cds_lfs_node *__cds_lfs_pop(struct cds_lfs_stack *s)
@@ -315,7 +315,7 @@ static inline struct cds_lfs_node *__cds_lfs_pop(struct cds_lfs_stack *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));
+	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)