From patchwork Tue Mar 14 23:20:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1757085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Ju6fexMK; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbqJT0x0Pz1yWs for ; Wed, 15 Mar 2023 10:20:39 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 674223858408 for ; Tue, 14 Mar 2023 23:20:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 674223858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678836037; bh=2NU5UVEnwQiRoWCPzsTAG0DYRn70eFkGIhIVRBnpU3k=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Ju6fexMKKUamKM/Tf5qTIUUOcMOhJy4G7jqmcROTJVVwnf+1kTfVEOsuqPN46J5QZ vC+GiSde0Tw/w0x7tt3rzw2sASVxuIr8SpdUjOK4cwp4fZlXLu9NggVe7rjMr/8Y+r vZy6aLD9DAjiBLoexOkFviF7dQPnUO+xIj9rVOYM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id ABDE03858D39 for ; Tue, 14 Mar 2023 23:20:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ABDE03858D39 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-PX6Ub7jfNxiTtnYNtUxoWA-1; Tue, 14 Mar 2023 19:20:14 -0400 X-MC-Unique: PX6Ub7jfNxiTtnYNtUxoWA-1 Received: by mail-qv1-f70.google.com with SMTP id j13-20020a0cc34d000000b005a37f812e48so5869454qvi.12 for ; Tue, 14 Mar 2023 16:20:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678836013; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2NU5UVEnwQiRoWCPzsTAG0DYRn70eFkGIhIVRBnpU3k=; b=T9Kt7FcfPVZWNTugwbhjkRsZ1iR3sR6tFSOQqu15psTsPM0iEH6CL0vlBtKO3PK0OV iAaClsIlhLfN0tG9rVQfkpkrFkMNA02bZTZvBadCNmNUH8ajC+otm465SaMwjCfY/0vo lSuuPr1JThLsf8tk+IZDKDjiMsIeV0o//v85DILPdctK3wIuJGSLWmBtBsn3uM+mmTAg Nwl716Wmc6cmlSwBKp7jRYV2Jnjwo9XBzC86pXACaaeLPt2gZA2JVhKuPrJnPzW2YjwI 4BzStm6rE5C0iXW2xde322oQCNgVWEogT/UQmYtVWQBryvZl9HCYT11fS3fdh7pje9tZ PTTg== X-Gm-Message-State: AO0yUKVZLM3skYzSfrnq7UFUNfxNXgfhnEx5T5k42UMp7M5V46yLCjJ8 y399L3Wxes/o7CTov5sI6RjxHOs7GgRkPL2VH6l05g7k0N9GKFuRj8y62guTajZjKPA/aP0TZ8C 0MQ1zYe/hxVL3GnIkyZ0LJb0FDubU8WrxCDg0ObxQVi4L+ld3re/vFj/O0zv+rs0CMCTws0FP5m M= X-Received: by 2002:a05:622a:d2:b0:3bf:e3c1:9895 with SMTP id p18-20020a05622a00d200b003bfe3c19895mr66567874qtw.23.1678836013740; Tue, 14 Mar 2023 16:20:13 -0700 (PDT) X-Google-Smtp-Source: AK7set/2ydJ0GSRmTv59rU5+hhwTtMeDC9DLVcwaWxhan+DJ8si6zRHWZC949zaKnigOhl6UYl4NjA== X-Received: by 2002:a05:622a:d2:b0:3bf:e3c1:9895 with SMTP id p18-20020a05622a00d200b003bfe3c19895mr66567848qtw.23.1678836013415; Tue, 14 Mar 2023 16:20:13 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id e17-20020ac80111000000b003bfc335f124sm2642808qtg.79.2023.03.14.16.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 16:20:13 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [pushed] libstdc++: Fix template-head of repeat_view::_Iterator [PR109111] Date: Tue, 14 Mar 2023 19:20:05 -0400 Message-Id: <20230314232005.1575584-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.0 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, pushed to trunk as obvious. -- >8 -- PR libstdc++/109111 libstdc++-v3/ChangeLog: * include/std/ranges (repeat_view): Remove redundant parentheses in requires-clause. (repeat_view::_Iterator): Correct the requires-clause. --- libstdc++-v3/include/std/ranges | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 0725e700c47..b230ebefcf5 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -7407,8 +7407,8 @@ namespace views::__adaptor #define __cpp_lib_ranges_repeat 202207L template - requires (is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>> - && (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>)) + requires is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>> + && (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>) class repeat_view : public view_interface> { __detail::__box<_Tp> _M_value; @@ -7472,7 +7472,8 @@ namespace views::__adaptor repeat_view(_Tp, _Bound) -> repeat_view<_Tp, _Bound>; template - requires __detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t> + requires is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>> + && (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>) class repeat_view<_Tp, _Bound>::_Iterator { using __index_type