X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace-internal.h;h=227120dc86817097b8a84ecba2e507d34ca2ec8f;hp=b32f7cabc3b9ecc299d7edbe1f1d7614c57cd3fe;hb=83509119a945fc77faff869daaf48627e1c4b3fa;hpb=7f800dc7c2a13dc895a4c609150c231b6745317c

diff --git a/include/babeltrace/ctf-ir/trace-internal.h b/include/babeltrace/ctf-ir/trace-internal.h
index b32f7cab..227120dc 100644
--- a/include/babeltrace/ctf-ir/trace-internal.h
+++ b/include/babeltrace/ctf-ir/trace-internal.h
@@ -27,12 +27,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/ctf-ir/trace.h>
 #include <babeltrace/ctf-ir/event-types.h>
 #include <babeltrace/ctf-ir/event-fields.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/objects.h>
+#include <babeltrace/values.h>
 #include <glib.h>
 #include <sys/types.h>
 #include <uuid/uuid.h>
@@ -48,11 +48,11 @@ enum field_type_alias {
 };
 
 struct bt_ctf_trace {
-	struct bt_ctf_ref ref_count;
+	struct bt_object base;
 	int frozen;
 	uuid_t uuid;
 	int byte_order; /* A value defined in Babeltrace's "endian.h" */
-	struct bt_object *environment;
+	struct bt_value *environment;
 	GPtrArray *clocks; /* Array of pointers to bt_ctf_clock */
 	GPtrArray *stream_classes; /* Array of ptrs to bt_ctf_stream_class */
 	GPtrArray *streams; /* Array of ptrs to bt_ctf_stream */
@@ -60,15 +60,6 @@ struct bt_ctf_trace {
 	uint64_t next_stream_id;
 };
 
-struct environment_variable {
-	GString *name;
-	enum bt_environment_field_type type;
-	union {
-		GString *string;
-		int64_t integer;
-	} value;
-};
-
 struct metadata_context {
 	GString *string;
 	GString *field_name;