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

Use DOCTEST_* compiler macros and suppress pragmas warning #3550

Merged
merged 1 commit into from
Jun 21, 2022
Merged

Use DOCTEST_* compiler macros and suppress pragmas warning #3550

merged 1 commit into from
Jun 21, 2022

Conversation

falbrechtskirchinger
Copy link
Contributor

@falbrechtskirchinger falbrechtskirchinger commented Jun 21, 2022 •
edited
Loading

Use DOCTEST_* macros in place of predefined compiler macros for compiler detection and version checks.

The suppression of warning -Wrange-loop-construct in unit-items.cpp causes GCC<11 to warn about pragmas.

@falbrechtskirchinger
Copy link
Contributor Author

For reference:
Here's a g++10 run before this PR: https://github.com/nlohmann/json/runs/6973062108?check_suite_focus=true#step:5:92
With the patch, it builds cleanly: https://github.com/nlohmann/json/runs/6978632144?check_suite_focus=true#step:5:89

nlohmann
nlohmann reviewed Jun 21, 2022
View reviewed changes
tests/CMakeLists.txt Outdated Show resolved Hide resolved
@coveralls
Copy link

coveralls commented Jun 21, 2022 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling a0801ba on falbrechtskirchinger:fix-gcc11-warning into 87cda1d on nlohmann:develop.

@falbrechtskirchinger falbrechtskirchinger changed the title Suppress GCC<11 pragmas warning Use DOCTEST_* compiler macros and suppress pragmas warning Jun 21, 2022
falbrechtskirchinger
falbrechtskirchinger commented Jun 21, 2022
View reviewed changes
tests/src/unit-items.cpp Outdated Show resolved Hide resolved
tests/src/unit-regression2.cpp Show resolved Hide resolved
@falbrechtskirchinger
Use DOCTEST_* compiler macros and suppress pragmas warning
a0801ba 
Use DOCTEST_* macros in place of predefined compiler macros for compiler
detection and version checks.

The suppression of warning -Wrange-loop-construct in unit-items.cpp
causes GCC<11 to warn about pragmas. Suppressed by adding a version
check.
nlohmann
nlohmann approved these changes Jun 21, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Jun 21, 2022
@nlohmann nlohmann added this to the Release 3.11.0 milestone Jun 21, 2022
@nlohmann nlohmann merged commit 39e2768 into nlohmann:develop Jun 21, 2022
@nlohmann
Copy link
Owner

Thanks!

@falbrechtskirchinger falbrechtskirchinger deleted the fix-gcc11-warning branch June 21, 2022 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🔨 further change
Projects
None yet
Milestone
Release 3.11.0
Development

Successfully merging this pull request may close these issues.
3 participants
@falbrechtskirchinger @coveralls @nlohmann