X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-writer%2Fstream-class-internal.h;h=83f0bd4136161fda5edf210a6349e8acfe041100;hb=7e69c04f557e46fb50e5a888a3bc3451afbd3b8e;hp=f1a90e1f96beab7886c45d5bf8e3315c254ee2b7;hpb=65300d60e4b4f167e5fc8f584677757ce09a3844;p=babeltrace.git

diff --git a/include/babeltrace/ctf-writer/stream-class-internal.h b/include/babeltrace/ctf-writer/stream-class-internal.h
index f1a90e1f..83f0bd41 100644
--- a/include/babeltrace/ctf-writer/stream-class-internal.h
+++ b/include/babeltrace/ctf-writer/stream-class-internal.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H
 
 /*
- * BabelTrace - CTF Writer: Stream Class
- *
  * Copyright 2014 EfficiOS Inc.
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -40,11 +38,11 @@
 #include <babeltrace/ctf-writer/utils-internal.h>
 #include <babeltrace/ctf-writer/validation-internal.h>
 #include <babeltrace/ctf-writer/visitor.h>
-#include <babeltrace/object-internal.h>
+#include <babeltrace/ctf-writer/object-internal.h>
 #include <inttypes.h>
 
 struct bt_ctf_stream_class_common {
-	struct bt_object base;
+	struct bt_ctf_object base;
 	GString *name;
 
 	/* Array of pointers to event class addresses */
@@ -91,7 +89,7 @@ struct bt_ctf_event_class_common;
 
 BT_HIDDEN
 int bt_ctf_stream_class_common_initialize(struct bt_ctf_stream_class_common *stream_class,
-		const char *name, bt_object_release_func release_func);
+		const char *name, bt_ctf_object_release_func release_func);
 
 BT_HIDDEN
 void bt_ctf_stream_class_common_finalize(struct bt_ctf_stream_class_common *stream_class);
@@ -157,7 +155,7 @@ struct bt_ctf_trace_common *bt_ctf_stream_class_common_borrow_trace(
 		struct bt_ctf_stream_class_common *stream_class)
 {
 	BT_ASSERT(stream_class);
-	return (void *) bt_object_borrow_parent(&stream_class->base);
+	return (void *) bt_ctf_object_borrow_parent(&stream_class->base);
 }
 
 static inline
@@ -359,9 +357,9 @@ int bt_ctf_stream_class_common_set_packet_context_field_type(
 		goto end;
 	}
 
-	bt_object_put_ref(stream_class->packet_context_field_type);
-	bt_object_get_ref(packet_context_type);
+	bt_ctf_object_put_ref(stream_class->packet_context_field_type);
 	stream_class->packet_context_field_type = packet_context_type;
+	bt_ctf_object_get_ref(stream_class->packet_context_field_type);
 	BT_LOGV("Set stream class's packet context field type: "
 		"addr=%p, name=\"%s\", id=%" PRId64 ", "
 		"packet-context-ft-addr=%p",
@@ -436,8 +434,9 @@ int bt_ctf_stream_class_common_set_event_header_field_type(
 		goto end;
 	}
 
-	bt_object_put_ref(stream_class->event_header_field_type);
-	stream_class->event_header_field_type = bt_object_get_ref(event_header_type);
+	bt_ctf_object_put_ref(stream_class->event_header_field_type);
+	stream_class->event_header_field_type = event_header_type;
+	bt_ctf_object_get_ref(stream_class->event_header_field_type);
 	BT_LOGV("Set stream class's event header field type: "
 		"addr=%p, name=\"%s\", id=%" PRId64 ", "
 		"event-header-ft-addr=%p",
@@ -505,8 +504,9 @@ int bt_ctf_stream_class_common_set_event_context_field_type(
 		goto end;
 	}
 
-	bt_object_put_ref(stream_class->event_context_field_type);
-	stream_class->event_context_field_type = bt_object_get_ref(event_context_type);
+	bt_ctf_object_put_ref(stream_class->event_context_field_type);
+	stream_class->event_context_field_type = event_context_type;
+	bt_ctf_object_get_ref(stream_class->event_context_field_type);
 	BT_LOGV("Set stream class's event context field type: "
 		"addr=%p, name=\"%s\", id=%" PRId64 ", "
 		"event-context-ft-addr=%p",