fix compiler warnings and MinGW build #4082
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
Jojo-Schmitz
force-pushed
the
warnings
branch
2 times, most recently
from
3992d84
to
3eab271
Compare
Jojo-Schmitz
commented
Oct 30, 2018
| @@ -218,7 +218,6 @@ | |||
| // Undefined problematic #def'd macros in Microsoft headers | |||
| #undef STRING_NONE | |||
| #undef small | |||
| #undef DELETE | |||
There was a problem hiding this comment.
moved directly to where it is really needed...
Jojo-Schmitz
commented
Oct 30, 2018
| @@ -36,7 +36,7 @@ enum class ItemType { | |||
| //--------------------------------------------------------- | |||
| // DiffType | |||
| //--------------------------------------------------------- | |||
|
|
|||
| #undef DELETE | |||
There was a problem hiding this comment.
Needed not just for MSVC, but also for MinGW, and as thirdparty/diff_match_patch unconditionally #undef's it , we're doing it here too.
This actually doesn't fix a compiler warning. but a hard build error, with MinGW.
Jojo-Schmitz
force-pushed
the
warnings
branch
from
3eab271
to
0d033d8
Compare
Jojo-Schmitz
changed the title
anatoly-os
reviewed
Oct 31, 2018
mscore/scorecmp/scorecmp.cpp
Outdated
| @@ -240,7 +240,7 @@ void ScoreComparisonTool::updateDiff() | |||
|
|
|||
| Score* ScoreComparisonTool::openScoreVersion(const ScoreVersion& ver) | |||
| { | |||
| Score* s; | |||
| Score* s = 0; | |||
There was a problem hiding this comment.
nullptr is more effective.
There was a problem hiding this comment.
Well, AFAIK its the same thing to C/C++ and less to type. And on the occasions where I did use nullptr, it didn't pass review ;-)
There was a problem hiding this comment.
but as you want it: here we go
Jojo-Schmitz
force-pushed
the
warnings
branch
from
0d033d8
to
1923dd6
Compare
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.
No description provided.