mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix #17371: GCC regression with -Wmaybe-uninitialized (#19810)

Browse Source 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105937 was reported for
GCC12 and fixed in GCC13 (not yet released).

Leave the suppresions in place until we can get rid of GCC12
This commit is contained in:
Michał Janiszewski
2023-04-03 16:09:41 +02:00
committed by GitHub
parent 90599d9b5a
commit 470d02572d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/drawing/Drawing.String.cpp
View File

@@ -843,14 +843,14 @@ static void TTFProcessStringLiteral(DrawPixelInfo& dpi, std::string_view text, T
// Draw the TTF run
// This error suppression abomination is here to suppress https://github.com/OpenRCT2/OpenRCT2/issues/17371.
// Additionally, we have to suppress the error for the error suppression... :'-(
// TODO: Re-evaluate somewhere in 2023.
# ifdef __MINGW32__
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105937 is fixed in GCC13
# if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
# endif
auto len = it.GetIndex() - ttfRunIndex.value();
TTFDrawStringRawTTF(dpi, text.substr(ttfRunIndex.value(), len), info);
# ifdef __MINGW32__
# if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop
# endif
ttfRunIndex = std::nullopt;