Remove some unused includes in C++ files

[babeltrace.git] / src / plugins / ctf / fs-sink / fs-sink-ctf-meta.hpp

diff --git a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp
index e56ab5269db78448922f8765279d265b9df8e26c..6cde44fe914ae298b451c288c98fdd0bd88b5ada 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp
+++ b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp
@@ -7,15 +7,15 @@
 #ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
 #define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
 
-#include <babeltrace2/babeltrace.h>
-#include "common/common.h"
-#include "common/assert.h"
-#include "common/uuid.h"
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdbool.h>
-#include <ctype.h>
+
+#include <babeltrace2/babeltrace.h>
+
+#include "common/assert.h"
+#include "common/common.h"
+#include "common/uuid.h"
 
 enum fs_sink_ctf_field_class_type
 {
@@ -668,7 +668,7 @@ fs_sink_ctf_field_class_struct_borrow_member_by_index(struct fs_sink_ctf_field_c
 {
     BT_ASSERT_DBG(fc);
     BT_ASSERT_DBG(index < fc->members->len);
-    return &g_array_index(fc->members, struct fs_sink_ctf_named_field_class, index);
+    return &bt_g_array_index(fc->members, struct fs_sink_ctf_named_field_class, index);
 }
 
 static inline struct fs_sink_ctf_named_field_class *
@@ -759,7 +759,7 @@ fs_sink_ctf_field_class_struct_append_member(struct fs_sink_ctf_field_class_stru
     g_array_set_size(fc->members, fc->members->len + 1);
 
     named_fc =
-        &g_array_index(fc->members, struct fs_sink_ctf_named_field_class, fc->members->len - 1);
+        &bt_g_array_index(fc->members, struct fs_sink_ctf_named_field_class, fc->members->len - 1);
     _fs_sink_ctf_named_field_class_init(named_fc);
     g_string_assign(named_fc->name, name);
     named_fc->fc = member_fc;
@@ -772,7 +772,7 @@ fs_sink_ctf_field_class_variant_borrow_option_by_index(struct fs_sink_ctf_field_
 {
     BT_ASSERT_DBG(fc);
     BT_ASSERT_DBG(index < fc->options->len);
-    return &g_array_index(fc->options, struct fs_sink_ctf_named_field_class, index);
+    return &bt_g_array_index(fc->options, struct fs_sink_ctf_named_field_class, index);
 }
 
 static inline struct fs_sink_ctf_named_field_class *
@@ -811,7 +811,7 @@ fs_sink_ctf_field_class_variant_append_option(struct fs_sink_ctf_field_class_var
     g_array_set_size(fc->options, fc->options->len + 1);
 
     named_fc =
-        &g_array_index(fc->options, struct fs_sink_ctf_named_field_class, fc->options->len - 1);
+        &bt_g_array_index(fc->options, struct fs_sink_ctf_named_field_class, fc->options->len - 1);
     _fs_sink_ctf_named_field_class_init(named_fc);
     g_string_assign(named_fc->name, name);
     named_fc->fc = option_fc;