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

Fix #8917: Release builds with asserts enabled #8925

Merged
merged 1 commit into from Apr 1, 2021

Conversation

LordAro
Copy link
Member

@LordAro LordAro commented Apr 1, 2021

Motivation / Problem

Building release modes with assertions enabled was broken by #8916 & #8917

Description

Uses the WITH_ASSERTS macro definition instead, which is defined whenever assertions (OTTD's fake ones or the real ones) are enabled.

Limitations

Untested, except for locally & via https://github.com/LordAro/OpenTTD/actions/runs/709469793

Commit message needs rewording on squash to use the correct commit because I got the number wrong

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 Apr 1, 2021
@LordAro LordAro merged commit dd798d6 into OpenTTD:master Apr 1, 2021
@LordAro LordAro deleted the assert-fail branch April 1, 2021 22:57
LordAro added a commit to LordAro/OpenTTD that referenced this pull request Apr 17, 2021
@LordAro LordAro 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 18, 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

2 participants