Tracepoint API namespacing ctf_enum

[lttng-ust.git] / tests / compile / ctf-types / ust_tests_ctf_types.h

diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h
index 630d0d4ecc302346e289e637d7e1c701125f62f8..489f04a204d05146059477f6a6187eee7357afe7 100644 (file)
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -13,19 +13,19 @@
 #include <lttng/tracepoint.h>
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
-       TP_ENUM_VALUES(
-               ctf_enum_value("even", 0)
-               ctf_enum_value("uneven", 1)
-               ctf_enum_range("twoto4", 2, 4)
-               ctf_enum_value("five\"extra\\test", 5)
+       LTTNG_UST_TP_ENUM_VALUES(
+               lttng_ust_field_enum_value("even", 0)
+               lttng_ust_field_enum_value("uneven", 1)
+               lttng_ust_field_enum_range("twoto4", 2, 4)
+               lttng_ust_field_enum_value("five\"extra\\test", 5)
        )
 )
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
-       TP_ENUM_VALUES(
-               ctf_enum_value("zero", 0)
-               ctf_enum_value("five", 5)
-               ctf_enum_range("ten_to_twenty", 10, 20)
+       LTTNG_UST_TP_ENUM_VALUES(
+               lttng_ust_field_enum_value("zero", 0)
+               lttng_ust_field_enum_value("five", 5)
+               lttng_ust_field_enum_range("ten_to_twenty", 10, 20)
        )
 )
 
@@ -36,11 +36,11 @@ LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
 LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer(int, intfield, anint)
-               ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
-               ctf_enum(ust_tests_ctf_types, testenum, long long,
+               lttng_ust_field_integer(int, intfield, anint)
+               lttng_ust_field_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
+               lttng_ust_field_enum(ust_tests_ctf_types, testenum, long long,
                                enumfield_bis, enumval)
-               ctf_enum(ust_tests_ctf_types, testenum2, unsigned int,
+               lttng_ust_field_enum(ust_tests_ctf_types, testenum2, unsigned int,
                                enumfield_third, enumval2)
        )
 )
@@ -52,8 +52,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
 LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
        LTTNG_UST_TP_ARGS(int, anint, int, enumval),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer(int, intfield, anint)
-               ctf_enum(ust_tests_ctf_types, testenum, unsigned char,
+               lttng_ust_field_integer(int, intfield, anint)
+               lttng_ust_field_enum(ust_tests_ctf_types, testenum, unsigned char,
                        enumfield, enumval)
        )
 )