Fix Xcode warnings #6793
Merged
Fix Xcode warnings #6793
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
github-actions
bot
added
Add-ons
|
I should have added that this is currently for the debug build only, and that another step will be to make the flags the same for debug and release builds. |
| @@ -363,7 +363,7 @@ namespace { // Private helpers for move_unit() | |||
| , real_end_(begin_) | |||
| // Unit information: | |||
| , move_it_(resources::gameboard->units().find(*begin_)) | |||
| , orig_side_(( assert(move_it_ != resources::gameboard->units().end()), move_it_->side() )) | |||
| , orig_side_(( static_cast<void>(assert(move_it_ != resources::gameboard->units().end())), move_it_->side() )) | |||
There was a problem hiding this comment.
I think this is actually just wrong both ways. The correct fix here is probably to move it (and any other line referencing move_it_, like the following three) into the constructor body as assignments.
Basically, delete these four lines and add something like the following just above if(!is_ai_move()):
assert(move_it_ != resources::gameboard->units().end());
orig_side_ = move_it_->side();
orig_moves_ = move_it_->movement_left();
orig_dir_ = move_it_->facing();
goto_ = is_ai_move() ? move_it_->get_goto() : route.back();| @@ -6429,7 +6429,9 @@ | |||
| 460F21CA2858F72100EE2131 /* SignedRelease */ = { | |||
| isa = XCBuildConfiguration; | |||
| buildSettings = { | |||
| ALWAYS_SEARCH_USER_PATHS = NO; | |||
There was a problem hiding this comment.
I'm kinda surprised this didn't just break everything...
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.
Trying to fix the Xcode warnings. I'm putting this up here to see what the CI run says, and also because in some cases I do not know if what I did is the preferred solution. So let me know what needs to be changed.