From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A2C3338582BF for ; Fri, 9 Sep 2022 17:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A2C3338582BF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662744293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XtqysvV+0feIrrp2qkv2T8g/2vSEkm70iZThsfB+EhM=; b=fIfFK6xIoPXSlQjaUmcD4Jg2NIUK0GP3289XWejyIfDqVtjguZIPR2xoD9UpbSOlJ/U4X0 uOmmrpRfvvWiz/ed3LEIC3c+Sg2GUdHAafNIBxKQAqRrAXPdxkVKoGGGmJSqUTNlUNWHRS LpmrkJOJrsw4YFXXCQ3fpjQGlKZh0qg= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-593-AsvlaxCfO2qUp6oI_qaIEA-1; Fri, 09 Sep 2022 13:24:52 -0400 X-MC-Unique: AsvlaxCfO2qUp6oI_qaIEA-1 Received: by mail-qv1-f71.google.com with SMTP id q5-20020a056214194500b004a03466c568so1657358qvk.19 for ; Fri, 09 Sep 2022 10:24:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=XtqysvV+0feIrrp2qkv2T8g/2vSEkm70iZThsfB+EhM=; b=5zhdZgXvHBpF9iXZLGU+KG57CysGFXa2DKNOkFHNfI41XLIqiHW6ZLAf/IDcdMdCXY ugjKL3jphQnD7e9/ODXGQTTPv7qIN/AQvI7hU4DOYl5b6+QfPhBVzs/mCgLwuqmkz1ZQ oA8O8mTyY4v+t9MnANigwjIjsVdqY0cQYGgIU0y3MnP+FXfNibz3QBOJi0BYgXeEsJbf cdLxEVXzggdHl+57oLFY9uzC1fkG0kWkhMV+hA0367UwgfJM07y1c9RuqVyEs08EBH1k /84bhByTZ+vxOQfpS6UsTwaVFubPgizTjuLkyPlKbWuP/tvvcqje3WWox4XgPMvm6L3Q oVhg== X-Gm-Message-State: ACgBeo3VLN4huOKfhq/tX5yEh+TJ8VaaM4cOSJkeEVCE+AvMZ5FYNYXR xQb8XnX8oc9tllbKm3gsNZgvujER8imBBO90QtGYa2WMjtmz7QxqFbSft6w7zUdBH6PmYOo5+PY pKwLFhTEm9zZ5LvY= X-Received: by 2002:a05:622a:40e:b0:343:7769:5895 with SMTP id n14-20020a05622a040e00b0034377695895mr13861167qtx.467.1662744291547; Fri, 09 Sep 2022 10:24:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR6bjZ9bVgW2aOTlXetAU34KjtWxdRYcVJgVDOyDjJunnwmgwsGC8QMxeEm3VyYyJ5geOBGFsg== X-Received: by 2002:a05:622a:40e:b0:343:7769:5895 with SMTP id n14-20020a05622a040e00b0034377695895mr13861149qtx.467.1662744291251; Fri, 09 Sep 2022 10:24:51 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id f5-20020a05622a1a0500b003445bb107basm820250qtb.75.2022.09.09.10.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 10:24:50 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 3/3] libstdc++: Fix return type of empty zip/adjacent_transform [PR106803] Date: Fri, 9 Sep 2022 13:24:46 -0400 Message-Id: <20220909172446.1546805-3-ppalka@redhat.com> X-Mailer: git-send-email 2.37.3.518.g79f2338b37 In-Reply-To: <20220909172446.1546805-1-ppalka@redhat.com> References: <20220909172446.1546805-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,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: Tested on x86_64-pc-linux-gnu, does this series look OK for trunk? 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