X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-writer%2Fclock.c;h=f270ce3dd1e6984aabca8ee780d85a28cc4c63f3;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=fdb8f498f7012c6e8260c7d032a314f6ffd1419b;hpb=65300d60e4b4f167e5fc8f584677757ce09a3844;p=babeltrace.git

diff --git a/lib/ctf-writer/clock.c b/lib/ctf-writer/clock.c
index fdb8f498..f270ce3d 100644
--- a/lib/ctf-writer/clock.c
+++ b/lib/ctf-writer/clock.c
@@ -28,21 +28,21 @@
  */
 
 #define BT_LOG_TAG "CTF-WRITER-CLOCK"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-writer/clock-class-internal.h>
-#include <babeltrace/ctf-writer/clock-internal.h>
-#include <babeltrace/ctf-writer/utils.h>
-#include <babeltrace/ctf-writer/writer-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/object.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/ctf-writer/clock-class-internal.h>
+#include <babeltrace2/ctf-writer/clock-internal.h>
+#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2/ctf-writer/writer-internal.h>
+#include <babeltrace2/ctf-writer/object-internal.h>
+#include <babeltrace2/ctf-writer/object.h>
 #include <inttypes.h>
 
 static
-void bt_ctf_clock_destroy(struct bt_object *obj);
+void bt_ctf_clock_destroy(struct bt_ctf_object *obj);
 
 struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 {
@@ -56,7 +56,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 		goto error;
 	}
 
-	bt_object_init_shared(&clock->base, bt_ctf_clock_destroy);
+	bt_ctf_object_init_shared(&clock->base, bt_ctf_clock_destroy);
 	clock->value = 0;
 
 	/* Pre-2.0.0 backward compatibility: default frequency is 1 GHz */
@@ -76,7 +76,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 	return clock;
 
 error:
-	BT_OBJECT_PUT_REF_AND_RESET(clock);
+	BT_CTF_OBJECT_PUT_REF_AND_RESET(clock);
 	return clock;
 }
 
@@ -212,12 +212,12 @@ int bt_ctf_clock_get_value(struct bt_ctf_clock *clock, uint64_t *value)
 }
 
 static
-void bt_ctf_clock_destroy(struct bt_object *obj)
+void bt_ctf_clock_destroy(struct bt_ctf_object *obj)
 {
 	struct bt_ctf_clock *clock;
 
 	clock = container_of(obj, struct bt_ctf_clock, base);
-	bt_object_put_ref(clock->clock_class);
+	bt_ctf_object_put_ref(clock->clock_class);
 	g_free(clock);
 }