From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2E8AE3851142; Tue, 16 May 2023 12:50:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E8AE3851142 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684241421; bh=s0PcYAa2FzTkwDH2c+hgqJoiKnVrxuFa7JxP5Ofd0sQ=; h=From:To:Subject:Date:From; b=KOVdVIGeUTm4CMGNm5aZVOmu40CuNnm0CS6XLpoKowQ6D1MYCUA9iATTnRyTCSgt4 PyU4a4mXhLW9/Jb0aQKClrtM32O5Jiz/CnuKE+hAIYoL2qcvvYhJujB/33C8erk43H R5fNtzmf/9M7cj0XtAAAjwFTVX72SkOZgAnZVBwo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10771] libstdc++: Fix tests with non-const operator== X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: e4b0d0b84b719ea9cd3d0a7b0668cdd8055a07d2 X-Git-Newrev: 33e8fbf0fd8af74ac76fce4a30b98bea5ad47439 Message-Id: <20230516125021.2E8AE3851142@sourceware.org> Date: Tue, 16 May 2023 12:50:21 +0000 (GMT) List-Id: https://gcc.gnu.org/g:33e8fbf0fd8af74ac76fce4a30b98bea5ad47439 commit r11-10771-g33e8fbf0fd8af74ac76fce4a30b98bea5ad47439 Author: Jonathan Wakely Date: Thu Nov 10 14:11:27 2022 +0000 libstdc++: Fix tests with non-const operator== These tests fail in strict -std=c++20 mode but their equality ops don't need to be non-const, it looks like an accident. This fixes two FAILs with -std=c++20: FAIL: 20_util/tuple/swap.cc (test for excess errors) FAIL: 26_numerics/valarray/87641.cc (test for excess errors) libstdc++-v3/ChangeLog: * testsuite/20_util/tuple/swap.cc (MoveOnly::operator==): Add const qualifier. * testsuite/26_numerics/valarray/87641.cc (X::operator==): Likewise. (cherry picked from commit fbad7a74aaaddea3d7b39045a09dd3860603658e) Diff: --- libstdc++-v3/testsuite/20_util/tuple/swap.cc | 2 +- libstdc++-v3/testsuite/26_numerics/valarray/87641.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/testsuite/20_util/tuple/swap.cc b/libstdc++-v3/testsuite/20_util/tuple/swap.cc index 06d14612176..7142e95c782 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/swap.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/swap.cc @@ -38,7 +38,7 @@ struct MoveOnly MoveOnly(MoveOnly const&) = delete; MoveOnly& operator=(MoveOnly const&) = delete; - bool operator==(MoveOnly const& m) + bool operator==(MoveOnly const& m) const { return i == m.i; } void swap(MoveOnly& m) diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/87641.cc b/libstdc++-v3/testsuite/26_numerics/valarray/87641.cc index 391a288b349..c884688b9f6 100644 --- a/libstdc++-v3/testsuite/26_numerics/valarray/87641.cc +++ b/libstdc++-v3/testsuite/26_numerics/valarray/87641.cc @@ -39,7 +39,7 @@ struct X X() : val(1) { } X& operator+=(const X& x) { val += x.val; return *this; } - bool operator==(const X& x) { return val == x.val; } + bool operator==(const X& x) const { return val == x.val; } int val; };