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: Suppress warnings when asserts are disabled #8916

Merged
merged 1 commit into from Apr 1, 2021

Conversation

LordAro
Copy link
Member

@LordAro LordAro commented Mar 31, 2021

Motivation / Problem

Compiler warnings when compiling with asserts disabled (see #8914 output)

Description

Fixes warnings. Mostly just disabling the code. Only "major" change is surrounding the blitter registering

Limitations

None?

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')

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Mar 31, 2021
TrueBrain
TrueBrain previously approved these changes Mar 31, 2021
Comment on lines 294 to 296
#ifndef NDEBUG
SQInteger z = _table(_thread(_root_vm)->_roottable)->CountUsed();
#endif
assert(z == x);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For readability I think it'd be better to wrap the assert into the #ifndef block too, even if it's the same effect.

@TrueBrain TrueBrain merged commit 591ea98 into OpenTTD:master Apr 1, 2021
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Apr 1, 2021
@TrueBrain TrueBrain added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Apr 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants