diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-01-15 12:38:31 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-01-15 12:44:23 +0000 |
| commit | 4dc4584b6079ac801ed5f0c79d335891821dbb3b (patch) | |
| tree | 5e929f150273ee03046beea7ce63691782d5c34d | |
| parent | e658e8157db372555a853c02824f5fc78709a5b1 (diff) | |
| download | gcc-4dc4584b6079ac801ed5f0c79d335891821dbb3b.zip gcc-4dc4584b6079ac801ed5f0c79d335891821dbb3b.tar.gz gcc-4dc4584b6079ac801ed5f0c79d335891821dbb3b.tar.bz2 | |
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<wchar_t>::widen(char).
libstdc++-v3/ChangeLog:
* testsuite/std/time/clock/utc/io.cc: Use ctype to widen char.
| -rw-r--r-- | libstdc++-v3/testsuite/std/time/clock/utc/io.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/testsuite/std/time/clock/utc/io.cc b/libstdc++-v3/testsuite/std/time/clock/utc/io.cc index b327c7f..933cba6 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<std::ctype<wchar_t>>(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), |