X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Fwfstack.h;h=38e5b6b2dcb3099dec87f8a6b3fb4f5750e93fb1;hb=HEAD;hp=02d65b4e5ade175859400f54204e84673cfd7e0b;hpb=94d0eccaf38f87dfe2e3699a52b60c54bdc79972;p=urcu.git

diff --git a/include/urcu/wfstack.h b/include/urcu/wfstack.h
index 02d65b4..38e5b6b 100644
--- a/include/urcu/wfstack.h
+++ b/include/urcu/wfstack.h
@@ -1,26 +1,12 @@
+// SPDX-FileCopyrightText: 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_WFSTACK_H
 #define _URCU_WFSTACK_H
 
 /*
- * urcu/wfstack.h
- *
  * Userspace RCU library - Stack with wait-free push, blocking traversal.
- *
- * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <pthread.h>
@@ -98,11 +84,21 @@ struct cds_wfs_stack {
  *
  * 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_wfs_stack *_s;
 	struct cds_wfs_stack *s;
-} caa_c_transparent_union cds_wfs_stack_ptr_t;
+} __attribute__((__transparent_union__)) cds_wfs_stack_ptr_t;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 #ifdef _LGPL_SOURCE
 
@@ -376,77 +372,40 @@ static inline cds_wfs_stack_ptr_t cds_wfs_stack_cast(struct cds_wfs_stack *s)
 	return ret;
 }
 
-static inline bool cds_wfs_empty(struct __cds_wfs_stack *s)
+template<typename T> static inline bool cds_wfs_empty(T s)
 {
 	return cds_wfs_empty(cds_wfs_stack_cast(s));
 }
 
-static inline bool cds_wfs_empty(struct cds_wfs_stack *s)
-{
-	return cds_wfs_empty(cds_wfs_stack_cast(s));
-}
-
-static inline int cds_wfs_push(struct __cds_wfs_stack *s, struct cds_wfs_node *node)
+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);
 }
 
-static inline int cds_wfs_push(struct cds_wfs_stack *s, struct cds_wfs_node *node)
-{
-	return cds_wfs_push(cds_wfs_stack_cast(s), node);
-}
-
-static inline struct cds_wfs_node *__cds_wfs_pop_blocking(struct __cds_wfs_stack *s)
+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));
 }
 
-static inline struct cds_wfs_node *__cds_wfs_pop_blocking(struct cds_wfs_stack *s)
-{
-	return __cds_wfs_pop_blocking(cds_wfs_stack_cast(s));
-}
-
-static inline struct cds_wfs_node *
-	__cds_wfs_pop_with_state_blocking(struct __cds_wfs_stack *s, int *state)
+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);
 }
 
-static inline struct cds_wfs_node *
-	__cds_wfs_pop_with_state_blocking(struct cds_wfs_stack *s, int *state)
-{
-	return __cds_wfs_pop_with_state_blocking(cds_wfs_stack_cast(s), state);
-}
-
-static inline struct cds_wfs_node *__cds_wfs_pop_nonblocking(struct __cds_wfs_stack *s)
-
-{
-	return __cds_wfs_pop_nonblocking(cds_wfs_stack_cast(s));
-}
+template<typename T> static inline struct cds_wfs_node *__cds_wfs_pop_nonblocking(T s)
 
-static inline struct cds_wfs_node *__cds_wfs_pop_nonblocking(struct cds_wfs_stack *s)
 {
 	return __cds_wfs_pop_nonblocking(cds_wfs_stack_cast(s));
 }
 
-static inline struct cds_wfs_node *
-	__cds_wfs_pop_with_state_nonblocking(struct __cds_wfs_stack *s, int *state)
-{
-	return __cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_cast(s), state);
-}
-
-static inline struct cds_wfs_node *
-	__cds_wfs_pop_with_state_nonblocking(struct cds_wfs_stack *s, int *state)
+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);
 }
 
-static inline struct cds_wfs_head *__cds_wfs_pop_all(struct __cds_wfs_stack *s)
-{
-	return __cds_wfs_pop_all(cds_wfs_stack_cast(s));
-}
-
-static inline struct cds_wfs_head *__cds_wfs_pop_all(struct cds_wfs_stack *s)
+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));
 }