Update handling of __JETBRAINS_IDE__ macro #1017
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
1. Use it to conditionally define CATCH_INTERNAL_CONFIG_COUNTER, not CATCH_CONFIG_COUNTER, as __JETBRAINS_IDE__ is similar to compiler-provided macros, not to user-provided ones. 2. Since __COUNTER__ will work starting with CLion 2017.3, use it when possible (and hopefully remove this check altogether at some point).
|
Looks reasonable enough, but I am going to blame you if CLion 2017.3 comes out and it doesn't support |
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.
Use it to conditionally define
CATCH_INTERNAL_CONFIG_COUNTER, notCATCH_CONFIG_COUNTER, as__JETBRAINS_IDE__is similar tocompiler-provided macros, not to user-provided ones.
Since
__COUNTER__will work starting with CLion 2017.3, use itwhen possible (and hopefully remove this check altogether
at some point).
Description
CLion will support
__COUNTER__macro properly soon (https://youtrack.jetbrains.com/issue/CPP-820)