X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace2%2Fctf-writer%2Fevent-internal.h;h=97039878b53708bcd2c86bf1491e69012217798f;hp=d1d3dc9df669b19c4f6b51674b521d02ed89a4d5;hb=67d2ce028c96b6a3b3614b393d8928663bce4490;hpb=172e6876abbb70d0323a500e6b44f90641fbe2fb

diff --git a/include/babeltrace2/ctf-writer/event-internal.h b/include/babeltrace2/ctf-writer/event-internal.h
index d1d3dc9d..97039878 100644
--- a/include/babeltrace2/ctf-writer/event-internal.h
+++ b/include/babeltrace2/ctf-writer/event-internal.h
@@ -29,7 +29,7 @@
  */
 
 #include <babeltrace2/assert-internal.h>
-#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/ctf-writer/assert-pre-internal.h>
 #include <babeltrace2/babeltrace-internal.h>
 #include <babeltrace2/ctf-writer/event-class-internal.h>
 #include <babeltrace2/ctf-writer/event-internal.h>
@@ -74,8 +74,8 @@ void _bt_ctf_event_common_set_is_frozen(struct bt_ctf_event_common *event,
 # define bt_ctf_event_common_set_is_frozen(_event, _is_frozen)
 #endif
 
-#define BT_ASSERT_PRE_EVENT_COMMON_HOT(_event, _name)			\
-	BT_ASSERT_PRE_HOT((_event), (_name), ": event-addr=%p", (_event))
+#define BT_CTF_ASSERT_PRE_EVENT_COMMON_HOT(_event, _name)			\
+	BT_CTF_ASSERT_PRE_HOT((_event), (_name), ": event-addr=%p", (_event))
 
 static inline
 struct bt_ctf_event_class_common *bt_ctf_event_common_borrow_class(
@@ -111,7 +111,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload(
 {
 	struct bt_ctf_field_common *payload = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
+	BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
 	if (!event->payload_field) {
 		BT_LOGV("Event has no current payload field: addr=%p, "
@@ -133,7 +133,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_header(
 {
 	struct bt_ctf_field_common *header = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
+	BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
 	if (!event->header_field) {
 		BT_LOGV("Event has no current header field: addr=%p, "
@@ -155,7 +155,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_context(
 {
 	struct bt_ctf_field_common *context = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
+	BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
 	if (!event->context_field) {
 		BT_LOGV("Event has no current context field: addr=%p, "
@@ -177,7 +177,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_stream_event_context(
 {
 	struct bt_ctf_field_common *stream_event_context = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
+	BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
 	if (!event->stream_event_context_field) {
 		BT_LOGV("Event has no current stream event context field: addr=%p, "