# --- T2-COPYRIGHT-BEGIN --- # t2/package/*/fs-uae/hotfix-cxx20-numbers.patch # Copyright (C) 2026 The T2 SDE Project # SPDX-License-Identifier: GPL-2.0 or patched project license # --- T2-COPYRIGHT-END --- Rename the static numbers glyph table, as it is ambiguous with std::numbers in C++20 (GCC 16 default) due to using namespace std. Signed-off-by: René Rebe --- fs-uae-3.2.35/src/statusline.cpp 2026-11-13 19:33:15.216550479 +0100 +++ fs-uae-3.2.35/src/statusline.cpp 2026-11-13 19:33:15.218148095 +0100 @@ -44,7 +44,7 @@ void statusline_getpos (int *x, int *y, } } -static const char *numbers = { /* ugly 0123456789CHD%+-P */ +static const char *td_numbers = { /* ugly 0123456789CHD%+-P */ "+++++++--++++-+++++++++++++++++-++++++++++++++++++++++++++++++++++++++++++++-++++++-++++----++---+--------------+++++++" "+xxxxx+--+xx+-+xxxxx++xxxxx++x+-+x++xxxxx++xxxxx++xxxxx++xxxxx++xxxxx++xxxx+-+x++x+-+xxx++-+xx+-+x---+----------+xxxxx+" "+x+++x+--++x+-+++++x++++++x++x+++x++x++++++x++++++++++x++x+++x++x+++x++x++++-+x++x+-+x++x+--+x++x+--+x+----+++--+x---x+" @@ -67,7 +67,7 @@ static void write_tdnumber (uae_u8 *buf, int j; const char *numptr; - numptr = numbers + num * TD_NUM_WIDTH + NUMBERS_NUM * TD_NUM_WIDTH * y; + numptr = td_numbers + num * TD_NUM_WIDTH + NUMBERS_NUM * TD_NUM_WIDTH * y; for (j = 0; j < TD_NUM_WIDTH; j++) { if (*numptr == 'x') putpixel (buf, bpp, x + j, c1, 1);