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 "[[maybe_unused]]" instead of a wide variety of other ways we had #9331

Merged
merged 2 commits into from Jun 3, 2021

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

@frosch123 made the mistake of pointing out C++17 has [[maybe_unused]]. so yeah .. OCD triggers, down the rabbit hole we went. Tnx mate ;)

Description

While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.

Also removed assert_msg. I do not think we have used that in a while, and it completely unused.

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 affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

… ways we had

While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
@TrueBrain TrueBrain merged commit 28e9076 into OpenTTD:master Jun 3, 2021
@TrueBrain TrueBrain deleted the use-c++17-for-unused branch June 3, 2021 15:30
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