Make bitfield.h C++-friendly

[babeltrace.git] / src / compat / bitfield.h

diff --git a/src/compat/bitfield.h b/src/compat/bitfield.h
index e2f2c128ed79ad5048099ef042928b2743b6c5c4..72c857c4fbce0348266e6304b19b08f5a7e3dc3b 100644 (file)
--- a/src/compat/bitfield.h
+++ b/src/compat/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 */    \