X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Finactivity.c;h=3ca527c8440b552865c827d9d4a3429d997b2e0c;hb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;hp=9523bb86bc77993a13847a710f7592b020819bd3;hpb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;p=babeltrace.git

diff --git a/lib/graph/notification/inactivity.c b/lib/graph/notification/inactivity.c
index 9523bb86..3ca527c8 100644
--- a/lib/graph/notification/inactivity.c
+++ b/lib/graph/notification/inactivity.c
@@ -25,12 +25,14 @@
 
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/clock-value-internal.h>
+#include <babeltrace/trace-ir/clock-class.h>
+#include <babeltrace/trace-ir/clock-value-internal.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/graph/private-notification-inactivity.h>
 #include <babeltrace/graph/notification-inactivity-internal.h>
 #include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/object.h>
 
 static
 void bt_notification_inactivity_destroy(struct bt_object *obj)
@@ -47,7 +49,7 @@ void bt_notification_inactivity_destroy(struct bt_object *obj)
 	g_free(notification);
 }
 
-struct bt_notification *bt_notification_inactivity_create(
+struct bt_private_notification *bt_private_notification_inactivity_create(
 		struct bt_private_connection_private_notification_iterator *notif_iter,
 		struct bt_clock_class *default_clock_class)
 {
@@ -76,15 +78,17 @@ struct bt_notification *bt_notification_inactivity_create(
 	goto end;
 
 error:
-	BT_PUT(ret_notif);
+	BT_OBJECT_PUT_REF_AND_RESET(ret_notif);
 
 end:
-	return ret_notif;
+	return (void *) ret_notif;
 }
 
-int bt_notification_inactivity_set_default_clock_value(
-		struct bt_notification *notif, uint64_t value_cycles)
+int bt_private_notification_inactivity_set_default_clock_value(
+		struct bt_private_notification *priv_notif,
+		uint64_t value_cycles)
 {
+	struct bt_notification *notif = (void *) priv_notif;
 	struct bt_notification_inactivity *inactivity = (void *) notif;
 
 	BT_ASSERT_PRE_NON_NULL(notif, "Notification");