From 439f90cfdec9b31db16000c9310b67acb797b93e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 15 Apr 2021 16:21:19 -0400 Subject: [PATCH] Rename LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP to add LTTNG_UST_ prefix Rename LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP to LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP to use the LTTNG_UST_ prefix. This is public API, but was never documented, recently introduced, and does not appear to be actively used by any open source project. Since we are doing an ABI bump, clean this up. Signed-off-by: Mathieu Desnoyers Change-Id: Id59c9a589568826008accb3a810678cdddf242e3 --- include/lttng/ust-compiler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h index 475caa30..32fd1bb2 100644 --- a/include/lttng/ust-compiler.h +++ b/include/lttng/ust-compiler.h @@ -34,8 +34,8 @@ */ #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 +# ifndef LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP +# define LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP # endif #endif @@ -44,13 +44,13 @@ * 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 + * LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header * allocates those on the heap in C++. * * Example use: * static struct mystruct *var = LTTNG_UST_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 }); */ -#if defined (__cplusplus) && defined (LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP) +#if defined (__cplusplus) && defined (LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP) #define LTTNG_UST_COMPOUND_LITERAL(type, ...) new (type) __VA_ARGS__ #else #define LTTNG_UST_COMPOUND_LITERAL(type, ...) (type[]) { __VA_ARGS__ } -- 2.34.1