From 3a98c813165062fa31d915e2de97f6d46a900d2d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 15 Apr 2021 15:38:43 -0400 Subject: [PATCH] Namespace lttng_static_assert to lttng_ust_static_assert Signed-off-by: Mathieu Desnoyers Change-Id: I89c2d874ec72a82f1bc84b04abd34af2aa4b8505 --- include/lttng/ust-compiler.h | 6 +++--- include/lttng/ust-utils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h index f0ec8d0c..56077cac 100644 --- a/include/lttng/ust-compiler.h +++ b/include/lttng/ust-compiler.h @@ -66,7 +66,7 @@ * be used as a typedef name. */ #if defined (__cplusplus) || __STDC_VERSION__ >= 201112L -#define lttng_static_assert(predicate, msg, c_identifier_msg) \ +#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \ static_assert(predicate, msg) #else /* @@ -79,8 +79,8 @@ * of negative size which is invalid in C and forces a compiler error. The msg * parameter is used in the tentative typedef so it is printed to the user. */ -#define lttng_static_assert(predicate, msg, c_identifier_msg) \ - typedef char lttng_static_assert_##c_identifier_msg[2*!!(predicate)-1]; +#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \ + typedef char lttng_ust_static_assert_##c_identifier_msg[2*!!(predicate)-1]; #endif #endif /* _LTTNG_UST_COMPILER_H */ diff --git a/include/lttng/ust-utils.h b/include/lttng/ust-utils.h index 2a65dd53..2ebe917c 100644 --- a/include/lttng/ust-utils.h +++ b/include/lttng/ust-utils.h @@ -65,7 +65,7 @@ * user are of an integral type. */ #define lttng_ust_ctf_array_element_type_is_supported(type, item) \ - lttng_static_assert(lttng_ust_is_integer_type(type), \ + lttng_ust_static_assert(lttng_ust_is_integer_type(type), \ "Non-integer type `" #item "` not supported as element of CTF_ARRAY or CTF_SEQUENCE", \ Non_integer_type__##item##__not_supported_as_element_of_CTF_ARRAY_or_CTF_SEQUENCE); -- 2.34.1