projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use __noreturn__ for C11-compatibility
[userspace-rcu.git]
/
include
/
urcu
/
lfstack.h
diff --git
a/include/urcu/lfstack.h
b/include/urcu/lfstack.h
index 3b5034fc99a36a7433dfb90e12667028ec454f4c..0f4ee99d8c92a88d88d51fe47d36eb47275056fb 100644
(file)
--- a/
include/urcu/lfstack.h
+++ b/
include/urcu/lfstack.h
@@
-29,7
+29,6
@@
extern "C" {
#include <stdbool.h>
#include <pthread.h>
#include <stdbool.h>
#include <pthread.h>
-#include <urcu/compiler.h>
/*
* Lock-free stack.
/*
* Lock-free stack.
@@
-87,11
+86,21
@@
struct cds_lfs_stack {
*
* In C++, implement static inline wrappers using function overloading
* to obtain an API similar to C.
*
* 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;
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
#ifdef _LGPL_SOURCE
@@
-281,44
+290,23
@@
static inline cds_lfs_stack_ptr_t cds_lfs_stack_cast(struct cds_lfs_stack *s)
return ret;
}
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)
+template<typename T> static inline bool cds_lfs_empty(T s)
{
return cds_lfs_empty(cds_lfs_stack_cast(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,
+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);
}
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)
+template<typename T> static inline struct cds_lfs_node *__cds_lfs_pop(T s)
{
return __cds_lfs_pop(cds_lfs_stack_cast(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)
+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));
}
{
return __cds_lfs_pop_all(cds_lfs_stack_cast(s));
}
This page took
0.024206 seconds
and
4
git commands to generate.