X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-stream-internal.h;h=818fc431ff2d268de8d2a0c70036c2d125baaa81;hb=108b91d0ffd01cce874850b767c0f358eb642523;hp=df1b3dcb3a565d95fd516450b27a9c0bad7d8f11;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index df1b3dcb..818fc431 100644
--- 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
@@ -28,41 +28,21 @@
  */
 
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/trace-ir/packet.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/trace-ir/clock-value-internal.h>
+#include <babeltrace/assert-internal.h>
 
 struct bt_notification_stream_begin {
 	struct bt_notification parent;
 	struct bt_stream *stream;
+	struct bt_clock_value *default_cv;
 };
 
 struct bt_notification_stream_end {
 	struct bt_notification parent;
 	struct bt_stream *stream;
+	struct bt_clock_value *default_cv;
 };
 
-static inline
-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);
-	return notif_stream_begin->stream;
-}
-
-static inline
-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);
-	return notif_stream_end->stream;
-}
-
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H */