X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Fuatomic%2Fx86.h;fp=include%2Furcu%2Fuatomic%2Fx86.h;h=f4e1887477684f779edd2d865ad3e7edb86eee37;hp=c02c96d88af8bcf4beaedb36475daacf6a741a46;hb=13bf2f5734e6cab159fe7f9b8fcca175aa5f0e81;hpb=713234991cce999c376345400f9367f1e2317076

diff --git a/include/urcu/uatomic/x86.h b/include/urcu/uatomic/x86.h
index c02c96d..f4e1887 100644
--- a/include/urcu/uatomic/x86.h
+++ b/include/urcu/uatomic/x86.h
@@ -41,10 +41,16 @@ 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[1]; } __hp_1;
+typedef struct { char v[2]; } __hp_2;
+typedef struct { char v[4]; } __hp_4;
+typedef struct { char v[8]; } __hp_8;
+
+#define __hp(size, x)	((__hp_##size *)(x))
 
 #define _uatomic_set(addr, v)	((void) CMM_STORE_SHARED(*(addr), (v)))