Merge branch 'main' into patch-1

open-telemetry · Nov 30, 2022 · 6f59cd8 · 6f59cd8
2 parents 405b26b + 7e26a7e
commit 6f59cd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/api/include/opentelemetry/nostd/shared_ptr.h b/api/include/opentelemetry/nostd/shared_ptr.h
@@ -56,7 +56,8 @@ class shared_ptr
               typename std::enable_if<std::is_convertible<pointer, U *>::value>::type * = nullptr>
     void MoveTo(typename shared_ptr<U>::PlacementBuffer &buffer) noexcept
     {
-      new (buffer.data) shared_ptr_wrapper{std::move(this->ptr_)};
+      using other_shared_ptr_wrapper = typename shared_ptr<U>::shared_ptr_wrapper;
+      new (buffer.data) other_shared_ptr_wrapper{std::move(this->ptr_)};
     }
 
     virtual pointer Get() const noexcept { return ptr_.get(); }

diff --git a/exporters/prometheus/CMakeLists.txt b/exporters/prometheus/CMakeLists.txt
@@ -19,6 +19,9 @@ endif()
 
 add_library(opentelemetry_exporter_prometheus src/exporter.cc src/collector.cc
                                               src/exporter_utils.cc)
+
+set_target_properties(opentelemetry_exporter_prometheus
+                      PROPERTIES EXPORT_NAME prometheus_exporter)
 target_include_directories(
   opentelemetry_exporter_prometheus
   PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"