Namespace the struct trace_descriptor

[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 fc555fdd96f5e79cef3ddc9cae20e70a19628929..04e894512702fb110b7f900573c9524255d6f3a9 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -174,7 +174,7 @@ struct ctf_tracer_env {
 };
 
 struct ctf_trace {
-       struct trace_descriptor parent;
+       struct bt_trace_descriptor parent;
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
@@ -234,7 +234,7 @@ struct ctf_trace {
 
 struct ctf_stream_declaration {
        struct ctf_trace *trace;
-       /* parent is lexical scope conaining the stream scope */
+       /* parent is lexical scope containing the stream scope */
        struct declaration_scope *declaration_scope;
        /* innermost definition scope. to be used as parent of event. */
        struct definition_scope *definition_scope;
@@ -271,7 +271,7 @@ struct ctf_stream_declaration {
 struct ctf_event_declaration {
        /* stream mapped by stream_id */
        struct ctf_stream_declaration *stream;
-       /* parent is lexical scope conaining the event scope */
+       /* parent is lexical scope containing the event scope */
        struct declaration_scope *declaration_scope;
 
        struct declaration_struct *context_decl;