Skip to contentSkip to conversation

Make bitfield.h C++-friendly

PATCH Mathieu Desnoyers 1 participant 1 message Aug 20, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged into master branch, thanks!

Mathieu

Quoted 43 lines · ----- On Aug 19, 2019, at 6:51 PM, Simon Marchi [email protected] 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-modules, but this is just to keep things sync'ed across projects.

---
lib/bitfield.h | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)
lib/bitfield.h +5 -2
index a9e268b41530..7d5eaeaa068d 100644
@@ -55,8 +55,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`.
@@ -362,7 +366,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
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com