From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 20 Aug 2019 01:51:06 +0000 (-0400)
Subject: Make bitfield.h C++-friendly
X-Git-Tag: v2.12.0-rc1~26
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f6d8019ea6fbda4df5d746fd20fa5d596e7b0556;p=lttng-ust.git

Make bitfield.h C++-friendly

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.marchi@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/bitfield.h b/include/lttng/bitfield.h
index 5ed62938..9386fade 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 */	\