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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id 745EA385803D for ; Tue, 19 Oct 2021 18:29:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 745EA385803D Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-wmdlDUMCPtuEzI_w0MwYfw-1; Tue, 19 Oct 2021 14:29:50 -0400 X-MC-Unique: wmdlDUMCPtuEzI_w0MwYfw-1 Received: by mail-qk1-f199.google.com with SMTP id k20-20020a05620a143400b0045ff6c9119bso554831qkj.19 for ; Tue, 19 Oct 2021 11:29:50 -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=Bk8JXr81o5bjNUo9HJ82WSH+GBo9f928rzKC7SoemuL7gKlvK74fd9DD8tfooeBa2f CBeK2ev7PHYzlYrcTH0HkYjP2j8/CydNTksJxgjxKvJMMMSJW7XTDOyZgYS2guBYk32e kWQKK3bzwaf42nmBjB/AfHYquEDtqKqr0zXA4Pp7y31bFKhK2MmDdlug6MI+UsK2T2W7 2AbGme4wWU9OcPXoZ/b7Fs+CT0Oz4vUWDVvgLt5oPXyDwCnBkGGNiC6+oyZo/tIwpdvf RiUIys+9oQ5bAEYL0n4txVRzevezAwQ5R4ORwwQSvmyjzTkcJEzZeM2LzACAQHL8eWqn g8Og== X-Gm-Message-State: AOAM530A2LdLwM8uJHJgOCLOjPm3B82ko9GJ41VdROTe/u0Wd/UOV7Po 5kI3Rn8Fhx5NX6n6UYyZWO5GmvVmJobAEq/REZAK/WXCU6aCJB66Wmto4V11qaP+urtT6TkFx1x O2STf1Wezb/5p+IQ= X-Received: by 2002:a05:6214:7a8:: with SMTP id v8mr1611576qvz.17.1634668190453; 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) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2021 18:29:53 -0000 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) -- 2.33.1.711.g9d530dc002