Skip to content
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

Jump to bottom

Conditional include for codecvt header #1355

Merged
merged 3 commits into from
Apr 27, 2022
Merged

Conditional include for codecvt header #1355

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff34e45
conditional include for codecvt header
lalitb Apr 26, 2022
e17a909
Merge branch 'main' into codecvt-win32
lalitb Apr 26, 2022
a52487f
Merge branch 'main' into codecvt-win32
lalitb Apr 27, 2022
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
3 changes: 2 additions & 1 deletion exporters/etw/include/opentelemetry/exporters/etw/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <algorithm>
#include <chrono>
#include <codecvt>
#include <ctime>
#include <iomanip>
#include <locale>
Expand All @@ -24,6 +23,8 @@
# pragma comment(lib, "Rpcrt4.lib")
# include <Objbase.h>
# pragma comment(lib, "Ole32.Lib")
#else
# include <codecvt>
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down