From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 0EE3F3851C3E; Mon, 29 Mar 2021 20:01:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0EE3F3851C3E 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 r10-9573] libstdc++: Avoid narrowing conversion in subrange constructor X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 56b810af1bdf106b132dcf1f1a01573af6a3468b X-Git-Newrev: 4ab3d8aca1f377a4cbc94316770e629462ff8bbd Message-Id: <20210329200138.0EE3F3851C3E@sourceware.org> Date: Mon, 29 Mar 2021 20:01:38 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 20:01:38 -0000 https://gcc.gnu.org/g:4ab3d8aca1f377a4cbc94316770e629462ff8bbd commit r10-9573-g4ab3d8aca1f377a4cbc94316770e629462ff8bbd Author: Jonathan Wakely Date: Thu Oct 29 22:47:22 2020 +0000 libstdc++: Avoid narrowing conversion in subrange constructor libstdc++-v3/ChangeLog: * include/std/ranges (subrange::subrange(R&&)): Use direct-initialization instead of list-initialization, so a potential narrowing conversion from ranges::size(r) to the stored size isn't ill-formed. (cherry picked from commit a55cda891d69b5a238d2e237903829995ca7249c) Diff: --- libstdc++-v3/include/std/ranges | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 8d3b662f928..78dacbe5ec7 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -282,7 +282,7 @@ namespace ranges && convertible_to, _Sent> constexpr subrange(_Rng&& __r) requires _S_store_size && sized_range<_Rng> - : subrange{__r, ranges::size(__r)} + : subrange(__r, ranges::size(__r)) { } template<__detail::__not_same_as _Rng>