move atomic_shared_ptr to sdk common namespace (open-telemetry#625)

Troels51 · Mar 24, 2021 · 1a3e6cc · 1a3e6cc
1 parent bd68a22
commit 1a3e6cc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h b/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h
@@ -8,6 +8,8 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
+namespace common
+{
 /**
  * A wrapper to provide atomic shared pointers.
  *
@@ -52,5 +54,6 @@ class AtomicSharedPtr
   std::shared_ptr<T> ptr_;
 };
 #endif
+}  // namespace common
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
@@ -88,7 +88,7 @@ class LoggerProvider final : public opentelemetry::logs::LoggerProvider,
 
 private:
   // A pointer to the processor stored by this logger provider
-  opentelemetry::sdk::AtomicSharedPtr<LogProcessor> processor_;
+  opentelemetry::sdk::common::AtomicSharedPtr<LogProcessor> processor_;
 
   // A vector of pointers to all the loggers that have been created
   std::unordered_map<std::string, opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger>>

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer.h b/sdk/include/opentelemetry/sdk/trace/tracer.h
@@ -57,7 +57,7 @@ class Tracer final : public trace_api::Tracer, public std::enable_shared_from_th
   void CloseWithMicroseconds(uint64_t timeout) noexcept override;
 
 private:
-  opentelemetry::sdk::AtomicSharedPtr<SpanProcessor> processor_;
+  opentelemetry::sdk::common::AtomicSharedPtr<SpanProcessor> processor_;
   const std::shared_ptr<Sampler> sampler_;
   const opentelemetry::sdk::resource::Resource &resource_;
 };

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
@@ -72,7 +72,7 @@ class TracerProvider final : public opentelemetry::trace::TracerProvider
   bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
 
 private:
-  opentelemetry::sdk::AtomicSharedPtr<SpanProcessor> processor_;
+  opentelemetry::sdk::common::AtomicSharedPtr<SpanProcessor> processor_;
   std::shared_ptr<opentelemetry::trace::Tracer> tracer_;
   const std::shared_ptr<Sampler> sampler_;
   const opentelemetry::sdk::resource::Resource resource_;