Rewrite code where MSVS gives nodiscard warnings #39941
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
ifreund
reviewed
Apr 26, 2020
src/npcmove.cpp
Outdated
Comment on lines
476
to
478
| if( is_too_close ) { | ||
| break; | ||
| } |
There was a problem hiding this comment.
Minor, but we could move this check before the if ( guy.lock() ) { ... check to save a little on performance since I think this is a hot code path.
There was a problem hiding this comment.
This wont change anything since is_too_close is updated only after locking each guy.
If I understand your suggestion correctly.
There was a problem hiding this comment.
It could start out true though if dist <= def_radius is true.
There was a problem hiding this comment.
I saw it. I will amend.
|
|
||
| res.push_back( r ); | ||
| return true; | ||
| std::copy_if( recipes.begin(), recipes.end(), std::back_inserter( res ), |
There was a problem hiding this comment.
Yes, a similar code turned out to be a few lines below.
ifreund
added
<Bugfix>
AMurkin
force-pushed
the
fix-nodiscard-warnings
branch
from
39cd8a2
to
4a5c381
Compare
ifreund
reviewed
Apr 26, 2020
Co-Authored-By: Isaac Freund <ifreund@ifreund.xyz>
AMurkin
commented
Apr 26, 2020
fengjixuchui
added a commit
to fengjixuchui/Cataclysm-DDA
that referenced
this pull request
Apr 27, 2020
Rewrite code where MSVS gives nodiscard warnings (CleverRaven#39941)
Drewscriver
pushed a commit
to Drewscriver/Cataclysm-DDA
that referenced
this pull request
Apr 30, 2020
* Rewrite code where MSVS gives nodiscard warnings * Till the end Co-Authored-By: Isaac Freund <ifreund@ifreund.xyz> * Remove unused variable Co-authored-by: Isaac Freund <ifreund@ifreund.xyz>
This was referenced May 3, 2020
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.
Summary
SUMMARY: NonePurpose of change
This, I hope, fixes bugs detected by MSVS warnings:
warning C4834: discarding return value of function with 'nodiscard' attribute.Describe the solution
Testing
None. But it compiles.