From patchwork Tue Oct 19 18:29:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 46410 X-Patchwork-Delegate: jwakely.gcc@gmail.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D90E3858035 for ; Tue, 19 Oct 2021 18:32:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D90E3858035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634668379; bh=4cdd48gRVYKloqIQQDHOZcPUhDCRzCnHkDDVHqPEpuk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=toSTp4C6RJNPZx31AZt1g5+BcXJvbDujBA+4pU+ZfOftCBTiTmKJmo9lDJFdKhTLy IQ8FAAPi0yp1EBdY6aAed6N+XGyfd+zj8oB8xjRyNYphQKi7c6tySvK8W/8/71RcvC UcdT5Kh7P0FARGaBogkKf3Wzbaxe8Vzj1ba0jC4U= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id 7690F3857C4A for ; Tue, 19 Oct 2021 18:29:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7690F3857C4A Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-SyYV3utWNBqGjWYuCLLaSg-1; Tue, 19 Oct 2021 14:29:51 -0400 X-MC-Unique: SyYV3utWNBqGjWYuCLLaSg-1 Received: by mail-qv1-f72.google.com with SMTP id t12-20020a05621421ac00b00382ea49a7cbso759155qvc.0 for ; Tue, 19 Oct 2021 11:29:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4cdd48gRVYKloqIQQDHOZcPUhDCRzCnHkDDVHqPEpuk=; b=iyJTh/H9u4JvhHeRBPPTle8yhKWDkUofUJB4jvSAZSg+Z8lN1vKauOC1SbwYxlFCAs b4cI0tDy+1TMWLSId1RbiuhoOY2ZjjDD6rL752OYs35BQ+1kDPGWWqnMqfPgdhhxMxAB pqaA3OTsb0+v112V5/lxl0HIzmJ8myQfVI+Sn2qJb/3u6SVeXyZBxw4ReX2j3UHvEaU3 dxTs7MeDTnQ8UdKMTCysO7ImFGd1zN6SfjN/EIvmecJPtzBUF3FRsy11vaQO+qlHQZuX KAZSIsCjEKMYQc1VhFN5dq6UiEvldYJeQTUdzzsbHOanBjCrIx0sQ3u+EP0zJm3Cz+jM 6JEg== X-Gm-Message-State: AOAM5318byhXHsGbVwUtm1E8X4LgN6G/HEA6nHiNSzQb8Oc2QsjVvWmK tQX7hmn2MJWiAk3+oXwRUO8m3TAfEmKR8NH7iwjitk5SbMwBvDXJecYUdbHGyvEUS5OHYL6un6m XphriwKuyRPQeimXP0Qo7ZGIYJSnjZwTlUL4kH6y88J7i0QXOgbXXKSCg28byY5FifVk= X-Received: by 2002:a05:6214:7a8:: with SMTP id v8mr1611586qvz.17.1634668190493; Tue, 19 Oct 2021 11:29:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCiphF0Fh3CKAr8b23/DoJzkfbnTg3ryubAejwqoVUnGoDRIgYwoiXt2FVNVdKaOcmuPYkOw== X-Received: by 2002:a05:6214:7a8:: with SMTP id v8mr1611564qvz.17.1634668190289; Tue, 19 Oct 2021 11:29:50 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id c13sm7922234qtw.49.2021.10.19.11.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 11:29:49 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Implement LWG 3580 changes to ranges::iota_view Date: Tue, 19 Oct 2021 14:29:47 -0400 Message-Id: <20211019182947.1694133-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.7 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, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, does this look OK for trunk and branches? libstdc++-v3/ChangeLog: * include/std/ranges (iota_view::operator+): Adjust definition as per LWG 3580. (iota_view::operator-): Likewise. --- libstdc++-v3/include/std/ranges | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 18bd087985c..5e18c98eb2f 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -497,7 +497,10 @@ namespace ranges friend constexpr _Iterator operator+(_Iterator __i, difference_type __n) requires __detail::__advanceable<_Winc> - { return __i += __n; } + { + __i += __n; + return __i; + } friend constexpr _Iterator operator+(difference_type __n, _Iterator __i) @@ -507,7 +510,10 @@ namespace ranges friend constexpr _Iterator operator-(_Iterator __i, difference_type __n) requires __detail::__advanceable<_Winc> - { return __i -= __n; } + { + __i -= __n; + return __i; + } friend constexpr difference_type operator-(const _Iterator& __x, const _Iterator& __y)