X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-ir%2Fevent-internal.h;h=8e84596ad558235f20778c727b5f44fe25fb0c5c;hb=605e1019783967f33d86967e7c98dd52cbd69a4c;hp=eedceaea84f9ddc6ef6ca78bb193e9e56750b888;hpb=862ca4ed7b3a8ef14f69529d252bccc48a33108a;p=babeltrace.git

diff --git a/include/babeltrace/trace-ir/event-internal.h b/include/babeltrace/trace-ir/event-internal.h
index eedceaea..8e84596a 100644
--- a/include/babeltrace/trace-ir/event-internal.h
+++ b/include/babeltrace/trace-ir/event-internal.h
@@ -2,10 +2,9 @@
 #define BABELTRACE_TRACE_IR_EVENT_INTERNAL_H
 
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -32,15 +31,15 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
+#include <babeltrace/value.h>
+#include <babeltrace/trace-ir/clock-snapshot-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
 #include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/trace-ir/stream-internal.h>
 #include <babeltrace/trace-ir/packet.h>
 #include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/trace-ir/fields.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/trace-ir/event-class-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <babeltrace/object-internal.h>
@@ -64,7 +63,7 @@ struct bt_event {
 	struct bt_field *common_context_field;
 	struct bt_field *specific_context_field;
 	struct bt_field *payload_field;
-	struct bt_clock_value *default_cv;
+	struct bt_clock_snapshot *default_cs;
 	bool frozen;
 };
 
@@ -129,8 +128,8 @@ void bt_event_reset(struct bt_event *event)
 	BT_LIB_LOGD("Resetting event: %!+e", event);
 	bt_event_set_is_frozen(event, false);
 
-	if (event->default_cv) {
-		bt_clock_value_reset(event->default_cv);
+	if (event->default_cs) {
+		bt_clock_snapshot_reset(event->default_cs);
 	}
 
 	bt_object_put_no_null_check(&event->packet->base);