Skip to content

[BUILD] Fixes glibc++ 5 checking #3355

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

Merged
merged 4 commits into from
Apr 29, 2025
Merged

[BUILD] Fixes glibc++ 5 checking #3355

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
359c314
Fixes glibc++ 5 checking
owent Apr 9, 2025
96b2c90
Merge branch 'main' into fixes_3354
owent Apr 27, 2025
2e07c15
Always checking `OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS` when `OPENTELE…
owent Apr 27, 2025
c510a4a
Restore confg.h but left a warning
owent Apr 29, 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
14 changes: 0 additions & 14 deletions api/include/opentelemetry/config.h
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 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 @@ -10,15 +10,20 @@
# endif
#endif

#include <type_traits>

#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS)
# include <array>
# include <type_traits>

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

#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \
(defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422) // >= libstdc++-5
# define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
namespace nostd
{
Expand Down
1 change: 0 additions & 1 deletion sdk/include/opentelemetry/sdk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@

#pragma once

#include "opentelemetry/config.h"
#include "opentelemetry/sdk/common/global_log_handler.h"
Loading