X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fhello.cxx%2Fust_tests_hello.h;h=9088aaf1ec92eff8d5722c1dc2e510c78bdf856c;hb=78684808fe09e0a094a75042e4f4383b2346bce6;hp=dfe20f5d007ad1881253fd55b044ed593e1e9347;hpb=5b393d6424d959e2efbb800b0c8a61b81bf9968e;p=lttng-ust.git

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index dfe20f5d..9088aaf1 100644
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -14,13 +14,13 @@
 #include <stddef.h>
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_hello, my_enum,
-	TP_ENUM_VALUES(
-		ctf_enum_value("zero", 0)
-		ctf_enum_value("one", 1)
-		ctf_enum_auto("two")
-		ctf_enum_value("three", 3)
-		ctf_enum_range("ten to twenty", 10, 20)
-		ctf_enum_auto("21!")
+	LTTNG_UST_TP_ENUM_VALUES(
+		lttng_ust_field_enum_value("zero", 0)
+		lttng_ust_field_enum_value("one", 1)
+		lttng_ust_field_enum_auto("two")
+		lttng_ust_field_enum_value("three", 3)
+		lttng_ust_field_enum_range("ten to twenty", 10, 20)
+		lttng_ust_field_enum_auto("21!")
 	)
 )
 
@@ -30,21 +30,21 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
 		 double, doublearg, float, floatarg,
 		 int, enumarg),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(int, intfield, anint)
-		ctf_integer_hex(int, intfield2, anint)
-		ctf_integer(long, longfield, anint)
-		ctf_integer_network(int, netintfield, netint)
-		ctf_integer_network_hex(int, netintfieldhex, netint)
-		ctf_array(long, arrfield1, values, 3)
-		ctf_array_text(char, arrfield2, text, 10)
-		ctf_sequence(char, seqfield1, text,
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_integer_hex(int, intfield2, anint)
+		lttng_ust_field_integer(long, longfield, anint)
+		lttng_ust_field_integer_network(int, netintfield, netint)
+		lttng_ust_field_integer_network_hex(int, netintfieldhex, netint)
+		lttng_ust_field_array(long, arrfield1, values, 3)
+		lttng_ust_field_array_text(char, arrfield2, text, 10)
+		lttng_ust_field_sequence(char, seqfield1, text,
 			     size_t, textlen)
-		ctf_sequence_text(char, seqfield2, text,
+		lttng_ust_field_sequence_text(char, seqfield2, text,
 			     size_t, textlen)
-		ctf_string(stringfield, text)
-		ctf_float(float, floatfield, floatarg)
-		ctf_float(double, doublefield, doublearg)
-		ctf_enum(ust_tests_hello, my_enum, int, enumfield, enumarg)
+		lttng_ust_field_string(stringfield, text)
+		lttng_ust_field_float(float, floatfield, floatarg)
+		lttng_ust_field_float(double, doublefield, doublearg)
+		lttng_ust_field_enum(ust_tests_hello, my_enum, int, enumfield, enumarg)
 	)
 )