From d5b155d6ee2ef1a7600c31e7aa1b3123515958d8 Mon Sep 17 00:00:00 2001
From: Sam Atac <samatac@google.com>
Date: Mon, 8 Jun 2020 17:04:01 +0000
Subject: [PATCH] changed define guards and minor syntactical changes

---
 api/include/opentelemetry/context/context.h            | 10 ++++------
 .../opentelemetry/context/contextvars_context.h        |  5 +----
 .../opentelemetry/context/threadlocal_context.h        |  5 +----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/api/include/opentelemetry/context/context.h b/api/include/opentelemetry/context/context.h
index 9a4264dbff..7a572e68dc 100644
--- a/api/include/opentelemetry/context/context.h
+++ b/api/include/opentelemetry/context/context.h
@@ -1,6 +1,4 @@
-#ifndef CONTEXT_H_
-#define CONTEXT_H_
-
+#pragma once
 
 /*The context class provides a context identifier*/
 class Context{
@@ -20,7 +18,7 @@ class Context{
      *
      * Args: none 
      */
-    Context operator[] (std::string i);    
+    Context operator[] (std::string str);    
 };
 
 /* The token class provides:????*/
@@ -56,10 +54,10 @@ class RuntimeContext {
      * Args:
      *  token: A reference to a previous context
      */
-    virtual void detach(int);
+    virtual void detach(Token token);
 
 
 };
 
 
-#endif //CONTEXT_H_
+
diff --git a/api/include/opentelemetry/context/contextvars_context.h b/api/include/opentelemetry/context/contextvars_context.h
index d3407fa057..8ee7c7d63d 100644
--- a/api/include/opentelemetry/context/contextvars_context.h
+++ b/api/include/opentelemetry/context/contextvars_context.h
@@ -1,5 +1,4 @@
-#ifndef CONTEXT_VARS_CONTEXT_H_
-#define CONTEXT_VARS_CONTEXT_H_
+#pragma once
 
 #include "context.h"
 #include <string>
@@ -46,5 +45,3 @@ class ContextVarsRuntimeContext: public RuntimeContext{
 
 
 
-#endif //CONTEXT_VARS_CONTEXT_H_
-
diff --git a/api/include/opentelemetry/context/threadlocal_context.h b/api/include/opentelemetry/context/threadlocal_context.h
index 2b267e9da5..255f7e69b9 100644
--- a/api/include/opentelemetry/context/threadlocal_context.h
+++ b/api/include/opentelemetry/context/threadlocal_context.h
@@ -1,5 +1,4 @@
-#ifndef THREAD_LOCAL_CONTEXT_H_
-#define THREAD_LOCAL_CONTEXT_H_
+#pragma once
 
 #include "context.h"
 
@@ -44,5 +43,3 @@ class ThreadLocalRuntimeContext: public RuntimeContext(){
 
 };
 
-
-#endif  // THREAD_LOCAL_CONTEXT_H_