From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 6E6783856DC4; Fri, 9 Sep 2022 19:05:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E6783856DC4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662750308; bh=trQL8Rd4VzwrdDtdp6aLLPImuHvi7aDYfk1pam4g+YA=; h=From:To:Subject:Date:From; b=tOv+wWFpJTk0OxPqd9HnP1y/3ec5l+JiYxolRSiOTR/lPZMK+P6nefxUyqrEBaeGO ldmFmaQHf7zeNitGOSRKU7C0PR/80X3PGR3uXmT8Jjiw7xzbsyIYCFOmtKNwNunLMp nfmOvVjNF72K6gDb2Sf2ggELSFy3gSIPZMMC3nUU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-2569] libstdc++: Fix return type of empty zip_/adjacent_transform [PR106803] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: e469506b7fdd1bf2c958ca3140573a474fcba3b8 X-Git-Newrev: 8298427f6b546cabb853edd45c009cd1967b9d38 Message-Id: <20220909190508.6E6783856DC4@sourceware.org> Date: Fri, 9 Sep 2022 19:05:08 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8298427f6b546cabb853edd45c009cd1967b9d38 commit r13-2569-g8298427f6b546cabb853edd45c009cd1967b9d38 Author: Patrick Palka Date: Fri Sep 9 14:59:14 2022 -0400 libstdc++: Fix return type of empty zip_/adjacent_transform [PR106803] PR libstdc++/106803 libstdc++-v3/ChangeLog: * include/std/ranges (views::_ZipTransform::operator()): Correct return type in the empty case. (views::_AdjacentTransform::operator()): Likewise. Diff: --- libstdc++-v3/include/std/ranges | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 37ad80ad3de..20eb4e82ac8 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -5071,7 +5071,7 @@ namespace views::__adaptor operator() [[nodiscard]] (_Fp&& __f, _Ts&&... __ts) const { if constexpr (sizeof...(_Ts) == 0) - return views::empty>>; + return views::empty&>>>; else return zip_transform_view(std::forward<_Fp>(__f), std::forward<_Ts>(__ts)...); } @@ -5762,7 +5762,7 @@ namespace views::__adaptor operator() [[nodiscard]] (_Range&& __r, _Fp&& __f) const { if constexpr (_Nm == 0) - return views::empty>; + return zip_transform(std::forward<_Fp>(__f)); else return adjacent_transform_view, decay_t<_Fp>, _Nm> (std::forward<_Range>(__r), std::forward<_Fp>(__f));