Unify reference counting using a common bt_object base

[babeltrace.git] / include / babeltrace / ctf-ir / event-internal.h

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index 5201ee53b7c54e353cd24789d97a4dc93054c125..17695f92bee84a8a18afbb4afd861a4bfd8890cf 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -27,22 +27,22 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/objects.h>
+#include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/object-internal.h>
 #include <glib.h>
 
 #define BT_CTF_EVENT_CLASS_ATTR_ID_INDEX       0
 #define BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX     1
 
 struct bt_ctf_event_class {
-       struct bt_ctf_ref ref_count;
-       struct bt_object *attributes;
+       struct bt_object base;
+       struct bt_value *attributes;
        /*
         * Weak reference; an event class does not have ownership of a
         * stream class.
@@ -56,7 +56,7 @@ struct bt_ctf_event_class {
 };
 
 struct bt_ctf_event {
-       struct bt_ctf_ref ref_count;
+       struct bt_object base;
        struct bt_ctf_event_class *event_class;
        /* Weak reference; an event does not have ownership of a stream */
        struct bt_ctf_stream *stream;