Skip to content

Fix defining OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS #3337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix defining OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS #3337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b27a56
Drop OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS config flag
georgthegreat Apr 2, 2025
e081139
Merge branch 'main' into type-traits
ThomsonTan Apr 7, 2025
ed0d925
Restore a weird crutch
georgthegreat Apr 8, 2025
5d5d143
Apply comments
georgthegreat Apr 8, 2025
14e036a
Merge branch 'main' into type-traits
ThomsonTan Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions api/include/opentelemetry/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@
#else
# define OPENTELEMETRY_HAS_INCLUDE(x) __has_include(x)
#endif

#if !defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>) // >= libstdc++-5
# define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
#endif
13 changes: 2 additions & 11 deletions api/include/opentelemetry/nostd/type_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,9 @@
#if defined(OPENTELEMETRY_STL_VERSION)
# if OPENTELEMETRY_STL_VERSION >= 2011
# include "opentelemetry/std/type_traits.h"
# define OPENTELEMETRY_HAVE_STD_TYPE_TRAITS
# endif
#endif

#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS)
# include <array>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS) Can be removed, but these headers are still required.

# include <type_traits>

# include "opentelemetry/config.h"
# include "opentelemetry/nostd/detail/void.h" // IWYU pragma: export
# include "opentelemetry/version.h"
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
namespace nostd
{
Expand Down Expand Up @@ -133,7 +123,8 @@ using is_nothrow_swappable = detail::swappable::is_nothrow_swappable<is_swappabl
* std::is_trivialy_copy_assignable
* std::is_trivialy_move_assignable
*/
#ifdef OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
#if ((defined(OPENTELEMETRY_STL_VERSION) && OPENTELEMETRY_STL_VERSION >= 2011) || \
(!defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>)) // >= libstdc++-5
using std::is_trivially_copy_assignable;
using std::is_trivially_copy_constructible;
using std::is_trivially_move_assignable;
Expand Down
Loading