From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id B3B893858429; Fri, 9 Sep 2022 18:29:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3B893858429 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x52a.google.com with SMTP id 29so3809165edv.2; Fri, 09 Sep 2022 11:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=ZTJGPIJbbxjAXP2N6CXeSsx4EJeEcQaywgikBhn4Lfk=; b=f/VeDQiA8czUV9Wz6XzJ8KchsYrU0gMjuVgH//g2KW6N3U8K4iNiHzfi8GmduTAHeU Igb+KTi6OWbYGkw7OnYMyLBTknChIqEodMB6BkW7x3tsqZcWyR17ZnyyulwthTlt8bex /cG6bEgeUCiETiyHe3kMOcd1SwIrgTN+iFf0OsevG4Uar/gEtANGQkep6YD3NdRdEjXo cDRptW8tq8mApNKttMEVpZfBacBMEkYmcrlf3KexWKURTCXC7jefDI0so53JV934UYju NOlU5dtO6d2x2hIJcsrGtd1ddGYsfxvOovZDDGeL4lwmlqxD0D2JHe+sYJMXfCItp/Cd FbBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=ZTJGPIJbbxjAXP2N6CXeSsx4EJeEcQaywgikBhn4Lfk=; b=IaVmb/buxuJH9w0U+vVhN0rc+lMYThYCPh1PDGufutGTDLUzi0Pi0Q9SnzuVZCM6pZ 3JSrjUou6z6j9tcT1gcvSfftfz4REAcgMU8GUYpPpu/wKH9whNay9sKZNOcU6pdYCz2z n1f4Gskurgf5aq7Rxl2CfcVye/K13TvvIlHbf3OG0iyk0OWmVYoM8m9m4T1NxEgnqTaW 30fTzxuTWMhfRZ5XTysK1iObipq6nItKmOek82dVTmVNtmQPpJMgc4SgqaeBecsdLQhU JPMqrBpYL1CHVRYLghzBr2bAI24GItQjpBU/vHTo0ozXJYR9H7EGhQNEOsUrtLaoSVEM V7qA== X-Gm-Message-State: ACgBeo2CnU8DuB8EUMETitqSP7gfV080XqOjILfxMZcayC6wUcQxV85T PvE5euRmT80vJah0ER3j1WAnFsIpsXPauYkmtyI= X-Google-Smtp-Source: AA6agR7Z3JT9M9kC32HHm0X7TE8igwQRjMiUuS4N0IspbrvCa/H6ytw4SCY0GuXXzl2edFVbgAAbtMVeT2q2MACm3X0= X-Received: by 2002:a05:6402:3586:b0:44e:c11b:8062 with SMTP id y6-20020a056402358600b0044ec11b8062mr12305444edc.356.1662748189668; Fri, 09 Sep 2022 11:29:49 -0700 (PDT) MIME-Version: 1.0 References: <20220909172446.1546805-1-ppalka@redhat.com> <20220909172446.1546805-3-ppalka@redhat.com> In-Reply-To: <20220909172446.1546805-3-ppalka@redhat.com> From: Jonathan Wakely Date: Fri, 9 Sep 2022 19:29:37 +0100 Message-ID: Subject: Re: [PATCH 3/3] libstdc++: Fix return type of empty zip/adjacent_transform [PR106803] To: Patrick Palka Cc: gcc-patches , "libstdc++" Content-Type: multipart/alternative; boundary="000000000000323a7905e842bb6d" X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000323a7905e842bb6d Content-Type: text/plain; charset="UTF-8" On Fri, 9 Sep 2022, 18:27 Patrick Palka via Libstdc++, < libstdc++@gcc.gnu.org> wrote: > Tested on x86_64-pc-linux-gnu, does this series look OK for trunk? > All three are OK, thanks. > PR libstdc++/106803 > > libstdc++-v3/ChangeLog: > > * include/std/ranges (views::_ZipTransform::operator()): Fix > return type in the empty case. > (views::_AdjacentTransform::operator()): Likewise. > --- > 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)); > -- > 2.37.3.518.g79f2338b37 > > --000000000000323a7905e842bb6d--