Fix for #416, Implicit falltrough warning on GCC7.1 (Re-sending) #432
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
Instead of adding std::fallthrough, this one disables implicit-fallthrough warnings via pragma push/pop mechanism
Also, this one fixes the forgotten pragma pop at the end of the header file
AzothAmmo
reviewed
Sep 6, 2017
include/cereal/archives/json.hpp
Outdated
| @@ -68,6 +68,11 @@ namespace cereal | |||
| #include <vector> | |||
| #include <string> | |||
|
|
|||
| #if defined(__clang__) or (defined(__GNUC__) and __GNUC__ >= 7) | |||
There was a problem hiding this comment.
I think the or and and need to be changed to boolean operators (|| and &&) to make MSVC happy
Apparently literal words cause problems in MSVC
|
Fixed, I didn't even thought that would cause a problem, thus didn't check Appveyor results. |
This was referenced Sep 7, 2017
Closed
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.
Although, I've opened a PR in #427, it got closed and says that it is merged. However, it also shows that no files are changed and I cannot find the commit message that shows it got merged. Thus, I am re-sending this pull request, with the fix that I've mentioned in that PR.
This one also fixes the build problem submitted in PR #431.