Skip to content

Commit eb62d77

Browse files
authored
Merge pull request #462 from open-telemetry/main
[BUILD] Remove duplicated deprecated warnings in logs headers (open-telemetry#3592)
2 parents 7f12ef5 + d3ad151 commit eb62d77

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

api/include/opentelemetry/logs/noop.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,28 @@ class NoopEventLogger final : public EventLogger
112112
class NoopEventLoggerProvider final : public EventLoggerProvider
113113
{
114114
public:
115+
# if defined(_MSC_VER)
116+
# pragma warning(push)
117+
# pragma warning(disable : 4996)
118+
# elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
119+
# pragma GCC diagnostic push
120+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
121+
# elif defined(__clang__) || defined(__apple_build_version__)
122+
# pragma clang diagnostic push
123+
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
124+
# endif
125+
115126
NoopEventLoggerProvider() : event_logger_{nostd::shared_ptr<EventLogger>(new NoopEventLogger())}
116127
{}
117128

129+
# if defined(_MSC_VER)
130+
# pragma warning(pop)
131+
# elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
132+
# pragma GCC diagnostic pop
133+
# elif defined(__clang__) || defined(__apple_build_version__)
134+
# pragma clang diagnostic pop
135+
# endif
136+
118137
nostd::shared_ptr<EventLogger> CreateEventLogger(
119138
nostd::shared_ptr<Logger> /*delegate_logger*/,
120139
nostd::string_view /*event_domain*/) noexcept override

api/include/opentelemetry/logs/provider.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,27 @@ class Provider
8484
OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
8585
GetEventProvider() noexcept
8686
{
87+
# if defined(_MSC_VER)
88+
# pragma warning(push)
89+
# pragma warning(disable : 4996)
90+
# elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
91+
# pragma GCC diagnostic push
92+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
93+
# elif defined(__clang__) || defined(__apple_build_version__)
94+
# pragma clang diagnostic push
95+
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
96+
# endif
97+
8798
static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
8899
return provider;
100+
101+
# if defined(_MSC_VER)
102+
# pragma warning(pop)
103+
# elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
104+
# pragma GCC diagnostic pop
105+
# elif defined(__clang__) || defined(__apple_build_version__)
106+
# pragma clang diagnostic pop
107+
# endif
89108
}
90109
#endif
91110

0 commit comments

Comments
 (0)