From 4dc4584b6079ac801ed5f0c79d335891821dbb3b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 15 Jan 2023 12:38:31 +0000 Subject: [PATCH] libstdc++: Fix narrowing conversion in std/time/clock/utc/io.cc For a port with signed char and unsigned wchar_t initializing a wchar_t array with a char is a narrowing conversion. The code is wrong for assuming that (int)'a' == (int)L'a' anyway, so fix it properly by using ctype::widen(char). libstdc++-v3/ChangeLog: * testsuite/std/time/clock/utc/io.cc: Use ctype to widen char. --- libstdc++-v3/testsuite/std/time/clock/utc/io.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/std/time/clock/utc/io.cc b/libstdc++-v3/testsuite/std/time/clock/utc/io.cc index b327c7f50c71..933cba65f44f 100644 --- a/libstdc++-v3/testsuite/std/time/clock/utc/io.cc +++ b/libstdc++-v3/testsuite/std/time/clock/utc/io.cc @@ -46,6 +46,7 @@ test_format() std::ostringstream ss; std::wostringstream wss; + const auto& ct = std::use_facet>(wss.getloc()); for (char c : specs) { @@ -68,7 +69,7 @@ test_format() "required by the chrono-specs") != s.npos); } - wchar_t wfmt[] = { L'{', L':', L'%', c, L'}' }; + wchar_t wfmt[] = { L'{', L':', L'%', ct.widen(c), L'}' }; try { wss << std::vformat(std::wstring_view(wfmt, 5), -- 2.47.3