Merged in lttng-ust master branch, thanks!
Mathieu
----- On Aug 19, 2019, at 6:51 PM, Simon Marchi simon.mar...@efficios.com wrote:
> This patch changes bitfield.h to be usable in C++11.
>
> It will probably never be compiled as C++ in the context of
> lttng-ust, but this is just to keep things sync'ed across projects.
>
> Signed-off-by: Simon Marchi <simon.mar...@efficios.com>
> ---
> include/lttng/bitfield.h | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/include/lttng/bitfield.h b/include/lttng/bitfield.h
> index 5ed629381ac6..9386fade1b76 100644
> --- a/include/lttng/bitfield.h
> +++ b/include/lttng/bitfield.h
> @@ -70,8 +70,12 @@
> * Produce a build-time error if the condition `cond` is non-zero.
> * Evaluates as a size_t expression.
> */
> +#ifdef __cplusplus
> +#define _BT_BUILD_ASSERT(cond) ([]{static_assert((cond), "");}, 0)
> +#else
> #define _BT_BUILD_ASSERT(cond) \
> sizeof(struct { int f:(2 * !!(cond) - 1); })
> +#endif
>
> /*
> * Cast value `v` to an unsigned integer of the same size as `v`.
> @@ -377,7 +381,7 @@ do {
> \
> do { \
> __typeof__(*(vptr)) *_vptr = (vptr); \
> __typeof__(*_vptr) _v; \
> - type *_ptr = (void *) (ptr); \
> + type *_ptr = (type *) (ptr); \
> unsigned long _start = (start), _length = (length); \
> type _mask, _cmask; \
> unsigned long _ts = sizeof(type) * CHAR_BIT; /* type size */ \
> --
> 2.23.0
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
