X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;h=c289628580ee420346a24e6e72bc9f7fa9299ebd;hb=e1904921db97b70d94e69f0ab3264c6f7fe62f32;hp=31eaf73c0139026b9adbb8c87ca7076c0df77125;hpb=4f74bc5ef1bff1198cf47bd823cc5dc2e8fd9649;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index 31eaf73c..c2896285 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -43,4 +43,32 @@
 #  define __lttng_ust_variable_attribute_no_sanitize_address
 #endif
 
+/*
+ * g++ 4.8 and prior do not support C99 compound literals. Therefore,
+ * force allocating those on the heap with these C++ compilers.
+ */
+#if defined (__cplusplus) && defined (__GNUC__) && \
+	(__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
+# ifndef LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+#  define LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+# endif
+#endif
+
+/*
+ * Compound literals with static storage are needed by LTTng.
+ * Compound literals are part of the C99 and C11 standards, but not
+ * part of the C++ standards. However, those are supported by both g++ and
+ * clang. In order to be strictly C++11 compliant, defining
+ * LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header
+ * allocates those on the heap in C++.
+ *
+ * Example use:
+ * static struct mystruct *var = __LTTNG_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 });
+ */
+#if defined (__cplusplus) && defined (LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP)
+#define __LTTNG_COMPOUND_LITERAL(type, ...)	new (type) __VA_ARGS__
+#else
+#define __LTTNG_COMPOUND_LITERAL(type, ...)	(type[]) { __VA_ARGS__ }
+#endif
+
 #endif /* _LTTNG_UST_COMPILER_H */