X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-class.h;h=e35b39652c21c7570348071f66e017e7e60fd3c5;hp=476b86dc3b8b3a63fb8f96a7a26a7ef6da612806;hb=9c08c816a55bbc538957648b49d41354e43c7cdf;hpb=d3765576bcdab2fff6360fffc0b77f1021d1a771

diff --git a/src/lib/trace-ir/field-class.h b/src/lib/trace-ir/field-class.h
index 476b86dc..e35b3965 100644
--- a/src/lib/trace-ir/field-class.h
+++ b/src/lib/trace-ir/field-class.h
@@ -209,8 +209,8 @@ struct bt_field_class_enumeration_mapping {
 	const struct bt_integer_range_set *range_set;
 };
 
-struct bt_field_class_unsigned_enumeration_mapping;
-struct bt_field_class_signed_enumeration_mapping;
+struct bt_field_class_enumeration_unsigned_mapping;
+struct bt_field_class_enumeration_signed_mapping;
 
 struct bt_field_class_enumeration {
 	struct bt_field_class_integer common;
@@ -221,9 +221,9 @@ struct bt_field_class_enumeration {
 	/*
 	 * This is an array of `const char *` which acts as a temporary
 	 * (potentially growing) buffer for
-	 * bt_field_class_unsigned_enumeration_get_mapping_labels_for_value()
+	 * bt_field_class_enumeration_unsigned_get_mapping_labels_for_value()
 	 * and
-	 * bt_field_class_signed_enumeration_get_mapping_labels_for_value().
+	 * bt_field_class_enumeration_signed_get_mapping_labels_for_value().
 	 *
 	 * The actual strings are owned by the mappings above.
 	 */
@@ -251,8 +251,8 @@ struct bt_named_field_class {
 
 struct bt_field_class_structure_member;
 struct bt_field_class_variant_option;
-struct bt_field_class_variant_with_unsigned_selector_option;
-struct bt_field_class_variant_with_signed_selector_option;
+struct bt_field_class_variant_with_selector_unsigned_option;
+struct bt_field_class_variant_with_selector_signed_option;
 
 struct bt_field_class_named_field_class_container {
 	struct bt_field_class common;
@@ -278,12 +278,12 @@ struct bt_field_class_array {
 	struct bt_field_class *element_fc;
 };
 
-struct bt_field_class_static_array {
+struct bt_field_class_array_static {
 	struct bt_field_class_array common;
 	uint64_t length;
 };
 
-struct bt_field_class_dynamic_array {
+struct bt_field_class_array_dynamic {
 	struct bt_field_class_array common;
 
 	/* Weak: never dereferenced, only use to find it elsewhere */