Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codechange: use std::array instead of C-style array for produced/accepts cargo #12481

Merged
merged 1 commit into from
Apr 20, 2024

Conversation

rubidium42
Copy link
Contributor

Motivation / Problem

I'd like to get rid of lengthof, but in the industry code there is a function to get suffices which (rightfully) uses static_assert on some array sizes. The bad thing is that std::size is not constant enough for these static_asserts to remain functioning, but with a std::array that's still possible.

Description

Replace the C-style arrays with std::array.
Replace some lengthof with std::tuple_size, where compile time constantly sized arrays must be constructed.
Replace some lengthof with std::size where that's required.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@rubidium42 rubidium42 merged commit e441033 into OpenTTD:master Apr 20, 2024
14 checks passed
@rubidium42 rubidium42 deleted the array_indspec_cargo branch April 20, 2024 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants