X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-writer%2Fclock-class.c;h=9e3807c02075f6e3e59471304ba5b2f2d9cc48b8;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=fa468f37a06378c04fd89a283ccdec01a3a9b82e;hpb=16ca5ff0568c72f5600ebc88b195fbc5ee88556d;p=babeltrace.git

diff --git a/lib/ctf-writer/clock-class.c b/lib/ctf-writer/clock-class.c
index fa468f37..9e3807c0 100644
--- a/lib/ctf-writer/clock-class.c
+++ b/lib/ctf-writer/clock-class.c
@@ -27,22 +27,22 @@
  */
 
 #define BT_LOG_TAG "CTF-WRITER-CLOCK-CLASS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/ctf-writer/clock-class-internal.h>
-#include <babeltrace/ctf-writer/utils.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/compat/string-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/ctf-writer/clock-class-internal.h>
+#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/compat/string-internal.h>
 #include <inttypes.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/ctf-writer/object-internal.h>
+#include <babeltrace2/assert-internal.h>
 
 static
-void bt_ctf_clock_class_destroy(struct bt_object *obj);
+void bt_ctf_clock_class_destroy(struct bt_ctf_object *obj);
 
 BT_HIDDEN
 bt_bool bt_ctf_clock_class_is_valid(struct bt_ctf_clock_class *clock_class)
@@ -136,7 +136,7 @@ struct bt_ctf_clock_class *bt_ctf_clock_class_create(const char *name,
 
 	clock_class->precision = 1;
 	clock_class->frequency = freq;
-	bt_object_init_shared(&clock_class->base, bt_ctf_clock_class_destroy);
+	bt_ctf_object_init_shared(&clock_class->base, bt_ctf_clock_class_destroy);
 
 	if (name) {
 		ret = bt_ctf_clock_class_set_name(clock_class, name);
@@ -150,7 +150,7 @@ struct bt_ctf_clock_class *bt_ctf_clock_class_create(const char *name,
 		clock_class, name);
 	return clock_class;
 error:
-	BT_PUT(clock_class);
+	BT_CTF_OBJECT_PUT_REF_AND_RESET(clock_class);
 	return clock_class;
 }
 
@@ -536,7 +536,7 @@ void bt_ctf_clock_class_freeze(struct bt_ctf_clock_class *clock_class)
 }
 
 static
-void bt_ctf_clock_class_destroy(struct bt_object *obj)
+void bt_ctf_clock_class_destroy(struct bt_ctf_object *obj)
 {
 	struct bt_ctf_clock_class *clock_class;