Fix: x86 and s390: uatomic __hp() macro C++ support

[urcu.git] / include / urcu / uatomic / s390.h

diff --git a/include/urcu/uatomic/s390.h b/include/urcu/uatomic/s390.h
index d7d545ad8f869ede493edef727233d7e9edc42ad..42f23e757807453586831af7e8210c04e1453d44 100644 (file)
--- a/include/urcu/uatomic/s390.h
+++ b/include/urcu/uatomic/s390.h
@@ -66,10 +66,14 @@ extern "C" {
  * containing an array of char of the specified size. This allows passing the
  * @addr arguments of the following inline functions as "m" and "+m" operands
  * to the assembly. The @size parameter should be a constant to support
- * compilers such as clang which do not support VLA.
+ * compilers such as clang which do not support VLA. Create typedefs because
+ * C++ does not allow types be defined in casts.
  */
 
-#define __hp(size, x)  ((struct { char v[size]; } *)(x))
+typedef struct { char v[4]; } __hp_4;
+typedef struct { char v[8]; } __hp_8;
+
+#define __hp(size, x)  ((__hp_##size *)(x))
 
 /* xchg */