From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 85AD23858D32; Sun, 15 Jan 2023 12:44:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 85AD23858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673786673; bh=Wn36SlHC/gJHGAmMJ7YQWhSLehx41275NXEeOwoEdbc=; h=From:To:Subject:Date:From; b=V5AgxC8F35G+PTmPBSejMlSrDY8W30OeBhuYDtw7Xve17IdZH20hRKRXk96ua44Uk gd31Uwt2yb4xbHCKgHJ3xEbyUdZtOyn+Y/rp+298qdqx81C9js0/ApGcYMwIEXIqnp 9P3tjVGzZSj4NsGCLqb/pFmj5OoCX4ykMhvOCz4s= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5175] libstdc++: Fix narrowing conversion in std/time/clock/utc/io.cc X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e658e8157db372555a853c02824f5fc78709a5b1 X-Git-Newrev: 4dc4584b6079ac801ed5f0c79d335891821dbb3b Message-Id: <20230115124433.85AD23858D32@sourceware.org> Date: Sun, 15 Jan 2023 12:44:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4dc4584b6079ac801ed5f0c79d335891821dbb3b commit r13-5175-g4dc4584b6079ac801ed5f0c79d335891821dbb3b Author: Jonathan Wakely Date: Sun Jan 15 12:38:31 2023 +0000 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. Diff: --- 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 b327c7f50c7..933cba65f44 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),