Namespace lttng_static_assert to lttng_ust_static_assert

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I89c2d874ec72a82f1bc84b04abd34af2aa4b8505

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index f0ec8d0c41d86a73304f3a23b495840168d12537..56077cac3d799584573572af1d46c44e9372f114 100644 (file)
--- 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 2a65dd5364ef21e996ea7c05d17dff9a09887e8f..2ebe917ca1ccd4e2a957cc4272ce43dbd0046fb3 100644 (file)
--- 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);