.gitignore: add some more IDE / tools related file

[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..12f427493f63b1ebdeee6de0d666a0541aa352a2 100644 (file)
--- a/src/lib/trace-ir/field-class.h
+++ b/src/lib/trace-ir/field-class.h
@@ -5,14 +5,12 @@
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  */
 
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  */
 

-#ifndef BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
-#define BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
+#ifndef BABELTRACE_LIB_TRACE_IR_FIELD_CLASS_H
+#define BABELTRACE_LIB_TRACE_IR_FIELD_CLASS_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 <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>
 #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)              \
 #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)   \
                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_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;
 struct bt_field_class {
        struct bt_object base;
        enum bt_field_class_type type;


@@ -252,4 +247,4 @@ void _bt_named_field_class_freeze(const struct bt_named_field_class *named_fc);
 void bt_field_class_make_part_of_trace_class(
                const struct bt_field_class *field_class);
 
 void bt_field_class_make_part_of_trace_class(
                const struct bt_field_class *field_class);
 

-#endif /* BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H */
+#endif /* BABELTRACE_LIB_TRACE_IR_FIELD_CLASS_H */