doc/api/libbabeltrace2/DoxygenLayout.xml: use `topics` tab

[babeltrace.git] / src / lib / trace-ir / field-class.h

diff --git a/src/lib/trace-ir/field-class.h b/src/lib/trace-ir/field-class.h
index 77df580407cadd69af852ab7269ff15a7e0808e4..289f3b0978bd752484ba94c2d160437cdae3632a 100644 (file)
--- a/src/lib/trace-ir/field-class.h
+++ b/src/lib/trace-ir/field-class.h
@@ -8,11 +8,9 @@
 #ifndef BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
 #define BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
 
-#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/clock-class.h>
 #include <babeltrace2/trace-ir/field-class.h>
 #include "common/macros.h"
-#include "common/common.h"
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include <stdbool.h>
@@ -20,16 +18,13 @@
 #include <glib.h>
 
 #define BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(_fc, _index)              \
-       (&g_array_index(((struct bt_field_class_enumeration *) (_fc))->mappings, \
+       (&bt_g_array_index(((struct bt_field_class_enumeration *) (_fc))->mappings, \
                struct bt_field_class_enumeration_mapping, (_index)))
 
 #define BT_FIELD_CLASS_ENUM_MAPPING_RANGE_AT_INDEX(_mapping, _index)   \
-       (&g_array_index((_mapping)->ranges,                             \
+       (&bt_g_array_index((_mapping)->ranges,                          \
                struct bt_field_class_enumeration_mapping_range, (_index)))
 
-struct bt_field;
-struct bt_field_class;
-
 struct bt_field_class {
        struct bt_object base;
        enum bt_field_class_type type;