Skip to content

Commit

Permalink
Merge branch 'context_api' into context_api_content
Browse files Browse the repository at this point in the history
  • Loading branch information
satac2 authored Jun 10, 2020
2 parents 9874c4c + 8e02c07 commit 7bceaab
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions api/include/opentelemetry/context/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,18 +168,15 @@ namespace context
public:


/* RuntimeContext: A default constructor that will set the context to
* an empty context object.
*/
RuntimeContext(){
context_ = Context();
}


/* RuntimeContext: A constructor that will set the context as
* the passed in context.
*/
RuntimeContext(Context &context){

context_ = context;
}

Expand All @@ -193,7 +190,6 @@ namespace context
context_ = context;

return old_context_token;

}


Expand All @@ -205,6 +201,7 @@ namespace context
}



/* Detach: Resets the context to a previous value stored in the
* passed in token.
*/
Expand Down

0 comments on commit 7bceaab

Please sign in to comment.