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.133.124]) by sourceware.org (Postfix) with ESMTPS id 2EC713858D39 for ; Wed, 19 Oct 2022 14:31:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2EC713858D39 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=1666189916; 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; bh=1LWfuejGjGPz3cbFF9WiVV2+mKU99yE42V+GKoxD/Qw=; b=GeFCekuW+hX0ZMtZvCEl822GploVMgib5ipJtrEFE5YhsOwGkngYkgTOK6I3wqoG72V4NP YGis4aTp90POfnYraZGVr/Sh5djVsVRYpMvAa/pRG2uYyJgy/C+MKqU8Jp3iOJOVHVG4E0 g7pl29Yeu0qfIrIZjgngFoKmyMf0D9A= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-624-nl5RTO7UNwqjHR4LeeqswQ-1; Wed, 19 Oct 2022 10:31:55 -0400 X-MC-Unique: nl5RTO7UNwqjHR4LeeqswQ-1 Received: by mail-qk1-f197.google.com with SMTP id h9-20020a05620a244900b006ee944ec451so15035679qkn.13 for ; Wed, 19 Oct 2022 07:31:55 -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:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1LWfuejGjGPz3cbFF9WiVV2+mKU99yE42V+GKoxD/Qw=; b=q1iCbBTqF1BowSwVW+rLEp1q8GgHlWWMqZOC3UfgqSdbWIEOQCViuKyRP1OX4bDiO5 KouWDduEN9wGv8UknzkZ/3AufzLYC00FK+p7GuBMVx9JOS5Efm6nfK7FMsAChXIWUKrE nGjx2w6xFetodtap2SO/IDjjYAFiLMZr6fegGjwZi5Fr8F8kT5vRc6DU6sFbx8QYh/EZ b3iJSj/gEMa1tzug/6KlIe2wnJkCOeSXRD/XJXG0OW2pI28JfhxBas63A93yNTaXGn2L KY8+wo99EqNY2wPA1bqEfIM/+dGztGBnud8Kxcxheo3iBD8RMqJGfqniMW0bQzMQbzw3 ZtQA== X-Gm-Message-State: ACrzQf0i61HdYwBLP0Iq3tPhiEWQKyUCmgPdbNWgyxcRxINEBhe/l8We CKN3EAL72RjUngPy5qoO5lPhmPHJNg3h1+yzkezBNEV+dr1GEe8A6AJejlH/7T17t3LDsBWaFPF f6o3xBsjo6SnVPeA= X-Received: by 2002:a05:620a:4005:b0:6ee:d836:9ed4 with SMTP id h5-20020a05620a400500b006eed8369ed4mr5784601qko.352.1666189915057; Wed, 19 Oct 2022 07:31:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5vJ3nMCGzdlDhK/FOV2Viseb0r9h8/RH7pAgP4qLNslFRBUtd+bO+1QCbaIgJFWmwyFppJSA== X-Received: by 2002:a05:620a:4005:b0:6ee:d836:9ed4 with SMTP id h5-20020a05620a400500b006eed8369ed4mr5784574qko.352.1666189914788; Wed, 19 Oct 2022 07:31:54 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id j4-20020a05620a410400b006eef13ef4c8sm3817788qko.94.2022.10.19.07.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 07:31:54 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Fix typo in stride_view's operator- [PR107313] Date: Wed, 19 Oct 2022 10:31:41 -0400 Message-Id: <20221019143141.248710-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.1.119.g9c32cfb49c 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.1 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=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: PR libstdc++/107313 libstdc++-v3/ChangeLog: * include/std/ranges (stride_view::_Iterator::operator-): Fix typo. * testsuite/std/ranges/adaptors/stride/1.cc (test03): New test. --- libstdc++-v3/include/std/ranges | 2 +- .../testsuite/std/ranges/adaptors/stride/1.cc | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index d113cf19dc7..b29264931cc 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -7874,7 +7874,7 @@ namespace views::__adaptor friend constexpr difference_type operator-(default_sentinel_t __y, const _Iterator& __x) requires sized_sentinel_for, iterator_t<_Base>> - { return __detail::__div_ceil(__x._M_end, __x._M_current, __x._M_stride); } + { return __detail::__div_ceil(__x._M_end - __x._M_current, __x._M_stride); } friend constexpr difference_type operator-(const _Iterator& __x, default_sentinel_t __y) diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc index 745d1a61c1b..37ae896014a 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc @@ -64,10 +64,30 @@ test02() VERIFY( ranges::equal(v, (int[]){1, 4, 7}) ); } +void +test03() +{ + // PR libstdc++/107313 + int x[] = {1, 2, 3, 4, 5}; + __gnu_test::test_input_range rx(x); + auto r = views::counted(rx.begin(), 4) | views::stride(2); + auto i = r.begin(); + std::default_sentinel_t s = r.end(); + VERIFY( s != i ); + VERIFY( s - i == 2 && i - s == -2 ); + ++i; + VERIFY( s != i ); + VERIFY( s - i == 1 && i - s == -1 ); + ++i; + VERIFY( s == i ); + VERIFY( s - i == 0 && i - s == 0 ); +} + int main() { static_assert(test01()); test02<__gnu_test::test_input_range>(); test02<__gnu_test::test_forward_range>(); + test03(); } -- 2.38.1.119.g9c32cfb49c