Codechange: replace magic numbers and C-style arrays with C++-style array for share owners #9829
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
|
Wonder how long this temporary comment has been here. 😛 |
glx22
reviewed
Feb 26, 2022
…rray for share owners
rubidium42
force-pushed
the
no_magic_share_owner_cont
branch
from
ac1c1ea
to
eb2b8ec
Compare
michicc
approved these changes
Mar 8, 2022
crycket
reviewed
Mar 8, 2022
| assert(unowned_share != c->share_owners.end()); // share owners is guaranteed to contain at least one INVALID_OWNER, i.e. unowned share | ||
| *unowned_share = _current_company; | ||
|
|
||
| auto current_company_owns_share = [](auto share_owner) { return share_owner == _current_company; }; |
There was a problem hiding this comment.
I think _current_company should be captured in this lambda.
There was a problem hiding this comment.
_current_company is a global, it does not need a capture. No idea if a capture is optionally even allowed.
There was a problem hiding this comment.
Clang is quite resolute about it not being allowed. GCC "only" warns for it.
/home/rubidium/openttd/src/economy.cpp:2043:39: error: '_current_company' cannot be captured because it does not have automatic storage duration
auto current_company_owns_share = [&_current_company](auto share_owner) { return share_owner == _current_company; };
^
/home/rubidium/openttd/src/company_func.h:34:18: note: '_current_company' declared here
extern CompanyID _current_company;
^
1 error generated.
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.
Motivation / Problem
I was looking at some PR, saw magic numbers related to share owners and thought this could be done nicer/clearer with C++-style arrays and algorithms.
Description
Should be a 1:1 functional code change that replaces C-style arrays, magic numbers and lengthof with C++ algorithms and for loops.
Limitations
None... although with C++20 ranges it could be even simpler.
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.