Fix warning suppressions leaking under clang.exe #2280
Merged
Conversation
This file contains 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
When running clang.exe under Windows, catch.hpp leaks warning suppressions because it uses `#pragma warning(push)` & `#pragma warning(pop)` around warning suppressions like `#pragma clang diagnostic ignore "-Wunused-variable"`, instead of using `#pragma clang diagnostic push` and `#pragma clang diagnostic pop`. This fixes that by only defining `CATCH_INTERNAL_START_WARNINGS_SUPPRESSION` and `CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION` to be the cl.exe variants if `defined(_MSC_VER) && !defined(__clang__)`.
Codecov Report
@@ Coverage Diff @@
## v2.x #2280 +/- ##
=======================================
Coverage 90.09% 90.09%
=======================================
Files 113 113
Lines 5035 5035
=======================================
Hits 4536 4536
Misses 499 499 |
|
Thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
When running clang.exe under Windows, catch.hpp leaks warning
suppressions because it uses
#pragma warning(push)&#pragma warning(pop)around warning suppressions like#pragma clang diagnostic ignore "-Wunused-variable", instead of using#pragma clang diagnostic pushand#pragma clang diagnostic pop.This fixes that by only defining
CATCH_INTERNAL_START_WARNINGS_SUPPRESSIONandCATCH_INTERNAL_STOP_WARNINGS_SUPPRESSIONto be the cl.exe variants ifdefined(_MSC_VER) && !defined(__clang__).