format conflict after merge

open-telemetry · May 14, 2021 · 0d7ab3e · 0d7ab3e
1 parent 6a02790
commit 0d7ab3e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/sdk/include/opentelemetry/sdk/metrics/async_instruments.h b/sdk/include/opentelemetry/sdk/metrics/async_instruments.h
@@ -20,10 +20,10 @@ namespace sdk
 namespace metrics
 {
 
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4250)  // inheriting methods via dominance
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4250)  // inheriting methods via dominance
+#  endif
 
 template <class T>
 class ValueObserver : public AsynchronousInstrument<T>, virtual public metrics_api::ValueObserver<T>
@@ -273,9 +273,9 @@ class UpDownSumObserver : public AsynchronousInstrument<T>,
   std::unordered_map<std::string, std::shared_ptr<Aggregator<T>>> boundAggregators_;
 };
 
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  endif
 
 }  // namespace metrics
 }  // namespace sdk

diff --git a/sdk/include/opentelemetry/sdk/metrics/instrument.h b/sdk/include/opentelemetry/sdk/metrics/instrument.h
@@ -21,10 +21,10 @@ namespace sdk
 namespace metrics
 {
 
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4250)  // inheriting methods via dominance
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4250)  // inheriting methods via dominance
+#  endif
 
 class Instrument : virtual public metrics_api::Instrument
 {
@@ -300,9 +300,9 @@ inline std::string KvToString(const opentelemetry::common::KeyValueIterable &kv)
   return ss.str();
 }
 
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  endif
 
 }  // namespace metrics
 }  // namespace sdk

diff --git a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
@@ -19,10 +19,10 @@ namespace sdk
 namespace metrics
 {
 
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4250)  // inheriting methods via dominance
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4250)  // inheriting methods via dominance
+#  endif
 
 template <class T>
 class BoundCounter final : public BoundSynchronousInstrument<T>, public metrics_api::BoundCounter<T>
@@ -437,9 +437,9 @@ class ValueRecorder final : public SynchronousInstrument<T>, public metrics_api:
       boundInstruments_;
 };
 
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  endif
 
 }  // namespace metrics
 }  // namespace sdk