Patches

Author: agrawroh

api/include/opentelemetry/config.h

@@ -3,12 +3,9 @@
 
 #pragma once
 
-#ifndef __has_include
-#  define OPENTELEMETRY_HAS_INCLUDE(x) 0
-#else
-#  define OPENTELEMETRY_HAS_INCLUDE(x) __has_include(x)
-#endif
+#include <type_traits>  // IWYU pragma: keep
 
-#if !defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>)  // >= libstdc++-5
+#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \
+    (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422)  // >= libstdc++-5
 #  define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
 #endif

api/include/opentelemetry/nostd/type_traits.h

@@ -142,8 +142,7 @@ using std::is_trivially_move_constructible;
 template <typename T>
 struct is_trivially_copy_constructible
 {
-  static constexpr bool value =
-      std::is_copy_constructible<T>::value && __is_trivially_assignable(T &, const T &);
+  static constexpr bool value = std::is_copy_constructible<T>::value && __has_trivial_copy(T);
 };
 
 template <typename T>
@@ -155,8 +154,7 @@ struct is_trivially_move_constructible
 template <typename T>
 struct is_trivially_copy_assignable
 {
-  static constexpr bool value =
-      std::is_copy_assignable<T>::value && __is_trivially_assignable(T &, const T &);
+  static constexpr bool value = std::is_copy_assignable<T>::value && __has_trivial_assign(T);
 };
 
 template <typename T>