X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-internal.h;h=f776f5ec95c7023b050ae3aad9e7f823732a55a8;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=5b7ce5397c712e56046946c4308109e4d3e772a6;hpb=6c677fb54f458456e3b5a15cffa6774bd7a86f54;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 5b7ce539..f776f5ec 100644
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
 
 /*
- * BabelTrace - Plug-in Notification internal
- *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -32,7 +30,7 @@
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/object-pool-internal.h>
 #include <babeltrace/types.h>
 
@@ -50,7 +48,7 @@ struct bt_notification {
 };
 
 #define BT_ASSERT_PRE_NOTIF_IS_TYPE(_notif, _type)			\
-	BT_ASSERT_PRE((_notif)->type == (_type),			\
+	BT_ASSERT_PRE(((struct bt_notification *) (_notif))->type == (_type), \
 		"Notification has the wrong type: expected-type=%s, "	\
 		"%![notif-]+n", bt_notification_type_string(_type),	\
 		(_notif))
@@ -117,8 +115,6 @@ static inline
 const char *bt_notification_type_string(enum bt_notification_type type)
 {
 	switch (type) {
-	case BT_NOTIFICATION_TYPE_UNKNOWN:
-		return "BT_NOTIFICATION_TYPE_UNKNOWN";
 	case BT_NOTIFICATION_TYPE_EVENT:
 		return "BT_NOTIFICATION_TYPE_EVENT";
 	case BT_NOTIFICATION_TYPE_INACTIVITY:
@@ -131,10 +127,6 @@ const char *bt_notification_type_string(enum bt_notification_type type)
 		return "BT_NOTIFICATION_TYPE_PACKET_BEGIN";
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 		return "BT_NOTIFICATION_TYPE_PACKET_END";
-	case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
-		return "BT_NOTIFICATION_TYPE_DISCARDED_EVENTS";
-	case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
-		return "BT_NOTIFICATION_TYPE_DISCARDED_PACKETS";
 	default:
 		return "(unknown)";
 	}