include/babeltrace/graph: fix some include guards

[babeltrace.git] / include / babeltrace / graph / notification-stream-internal.h

diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index b170e4e61375d106de77cc95b99538faa3af1f3c..a9067947bbf1f8a6370b6d8b3cc4e8a193888c9b 100644 (file)
--- a/include/babeltrace/graph/notification-stream-internal.h
+++ b/include/babeltrace/graph/notification-stream-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
 
 /*
  * BabelTrace - Stream-related Notifications
@@ -30,39 +30,40 @@
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/assert-internal.h>
 
 struct bt_notification_stream_begin {
        struct bt_notification parent;
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
 };
 
 struct bt_notification_stream_end {
        struct bt_notification parent;
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
 };
 
 static inline
-struct bt_ctf_stream *bt_notification_stream_begin_borrow_stream(
+struct bt_stream *bt_notification_stream_begin_borrow_stream(
                struct bt_notification *notif)
 {
        struct bt_notification_stream_begin *notif_stream_begin =
                container_of(notif,
                        struct bt_notification_stream_begin, parent);
 
-       assert(notif_stream_begin);
+       BT_ASSERT(notif_stream_begin);
        return notif_stream_begin->stream;
 }
 
 static inline
-struct bt_ctf_stream *bt_notification_stream_end_borrow_stream(
+struct bt_stream *bt_notification_stream_end_borrow_stream(
                struct bt_notification *notif)
 {
        struct bt_notification_stream_end *notif_stream_end =
                container_of(notif,
                        struct bt_notification_stream_end, parent);
 
-       assert(notif_stream_end);
+       BT_ASSERT(notif_stream_end);
        return notif_stream_end->stream;
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H */