[BUILD] Fix removing of NOMINMAX on Windows#2449
Merged
marcalff merged 2 commits intoopen-telemetry:mainfrom Dec 13, 2023
Merged
[BUILD] Fix removing of NOMINMAX on Windows#2449marcalff merged 2 commits intoopen-telemetry:mainfrom
marcalff merged 2 commits intoopen-telemetry:mainfrom
Conversation
lalitb
approved these changes
Dec 13, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2449 +/- ##
=======================================
Coverage 87.06% 87.06%
=======================================
Files 199 199
Lines 6087 6087
=======================================
Hits 5299 5299
Misses 788 788 |
marcalff
changed the title
marcalff
approved these changes
Dec 13, 2023
waywardmonkeys
added a commit
to waywardmonkeys/vcpkg
that referenced
this pull request
Jan 4, 2024
The patch to add a dependency of opentelemetry-proto on gRPC should not be needed after the upstream changes in: open-telemetry/opentelemetry-cpp#2268 Additionally, the "zpages" feature is removed as it is no longer present upstream after having been deprecated in a previous release. A patch is added extracted from open-telemetry/opentelemetry-cpp#2475 and open-telemetry/opentelemetry-cpp#2449 which fix problems that arose after `NOMINMAX` was no longer defined within opentelemetry-cpp on Windows. Fixes microsoft#35992.
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
NOMINMAX was removed in our API in below PR, but one more fix needed for a call of
::maxin the API. It was missed because this line is only hit when building for C++ 17 and above.#2420
For significant contributions please make sure you have completed the following items:
CHANGELOG.mdupdated for non-trivial changes