Merge branch 'main' into bug/jaeger_tag

open-telemetry · Jun 16, 2021 · 31c3896 · 31c3896
2 parents 969cc0c + 8bf9bbc
commit 31c3896
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,7 +107,7 @@ if(WITH_STL)
   add_definitions(-DHAVE_CPP_STDLIB)
   add_definitions(-DHAVE_GSL)
   # Require at least C++17. C++20 is needed to avoid gsl::span
-  if(CMAKE_VERSION VERSION_GREATER 3.18.0)
+  if(CMAKE_VERSION VERSION_GREATER 3.11.999)
     # Ask for 20, may get anything below
     set(CMAKE_CXX_STANDARD 20)
   else()

diff --git a/api/include/opentelemetry/std/variant.h b/api/include/opentelemetry/std/variant.h
@@ -140,6 +140,7 @@ constexpr auto visit(_Callable &&_Obj, _Variants &&... _Args)
 };
 
 #else
+using std::bad_variant_access;
 
 template <std::size_t I, class... Types>
 constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)

diff --git a/api/test/nostd/string_view_test.cc b/api/test/nostd/string_view_test.cc
@@ -4,7 +4,7 @@
 #include "opentelemetry/nostd/string_view.h"
 
 #include <gtest/gtest.h>
-
+#include <cstring>
 #include <map>
 
 using opentelemetry::nostd::string_view;
-Original file line number
+Diff line change
@@ Expand Up @@
     };
     #else
+    using std::bad_variant_access;
     template <std::size_t I, class... Types>
     constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
@@ Expand Down @@