X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;fp=include%2Flttng%2Fust-compiler.h;h=c289628580ee420346a24e6e72bc9f7fa9299ebd;hb=e1904921db97b70d94e69f0ab3264c6f7fe62f32;hp=799bca4291d2802ee590ab628dadc4e956fc1ddf;hpb=15b385c8a645128e3ed89f7f840c1441223097a4;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index 799bca42..c2896285 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -43,6 +43,17 @@
 #  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