From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 51F843858C98; Fri, 19 Jan 2024 19:13:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 51F843858C98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705691618; bh=nXtxKKDhdivj9YhrwOJ1VM22LeYmqKKZ+BBriOD3hxk=; h=From:To:Subject:Date:From; b=pIc5SoLj2MMnp9RsF3pFgIDelev0goim9oTwon0mFvyjacsL0x831O/qT7m+zgZOe XqQtVMXQAKTBoX3YOQnKUVsjARDBErQ11huKYxz4U66pbwitC2P05M6RY4AsYU0+JS FG3wuVY58rMhNgknskGX/XvYvceyL886yyzhx4Oc= 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 r14-8293] libstdc++: Do not use CTAD for _Utf32_view alias template (redux) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 502a3c03e40e8920afb734c077b045f6c5efd087 X-Git-Newrev: 631a922e5c8578a1c878b69f1651d482b661ef4a Message-Id: <20240119191338.51F843858C98@sourceware.org> Date: Fri, 19 Jan 2024 19:13:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:631a922e5c8578a1c878b69f1651d482b661ef4a commit r14-8293-g631a922e5c8578a1c878b69f1651d482b661ef4a Author: Jonathan Wakely Date: Fri Jan 19 14:31:48 2024 +0000 libstdc++: Do not use CTAD for _Utf32_view alias template (redux) My change in r14-8181-g665a3ff1539ce2 was incomplete as there's a second place using CTAD with the _Utf32_view alias template. This fixes it. libstdc++-v3/ChangeLog: * include/std/format (_Spec::_M_parse_fill_and_align): Do not use CTAD for _Utf32_view. Diff: --- libstdc++-v3/include/std/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index efc4a17ba36..f4d91517656 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -434,7 +434,7 @@ namespace __format if constexpr (__literal_encoding_is_unicode<_CharT>()) { // Accept any UCS scalar value as fill character. - _Utf32_view __uv(ranges::subrange(__first, __last)); + _Utf32_view> __uv({__first, __last}); if (!__uv.empty()) { auto __beg = __uv.begin();