Move memstream.h and uuid.h to include/babeltrace/compat directory

[babeltrace.git] / include / babeltrace / ctf-ir / metadata.h

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 4fa5c0bee03548e9f453787edceff9d4bdbb1dc5..5e92984dba40906c59bb96c5e4455182bc13233e 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -33,7 +33,7 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
@@ -188,10 +188,7 @@ struct ctf_trace {
        struct ctf_stream_definition *metadata;
        char *metadata_string;
        int metadata_packetized;
-       GHashTable *clocks;
        GHashTable *callsites;
-       struct ctf_clock *single_clock;         /* currently supports only one clock */
-       struct trace_collection *collection;    /* Container of this trace */
        GPtrArray *event_declarations;          /* Array of all the struct bt_ctf_event_decl */
 
        struct declaration_struct *packet_header_decl;
@@ -214,9 +211,6 @@ struct ctf_trace {
        DIR *dir;
        int dirfd;
        int flags;              /* open flags */
-
-       /* Heap of streams, ordered to always get the lowest timestamp */
-       struct ptr_heap *stream_heap;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \