From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 69F883848581; Fri, 11 Nov 2022 05:29:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69F883848581 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668144599; bh=whI5hvhym2u+hgIvQuYd6WIUzUcyIW288ylEzZyXdZg=; h=From:To:Subject:Date:From; b=ZZ/sywf88owG32Aye49jAYrKF79duEPvE+/gRDD9wspqnMb8TqrTMDV52CKiet/jU oE1mCQfxudN66fjp/tVSy5KCg5nr3quXtXdFOBv4myxi7kg7q4mcyB584kiqnfpCUD N44rX4XIGBXuA+mATI6dTJ+bWxNN0zYflwhOndAE= 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 r13-3891] libstdc++: Fix tests with non-const operator== X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f54ae4da1f60f4a2dea22ef184941d953442b86d X-Git-Newrev: fbad7a74aaaddea3d7b39045a09dd3860603658e Message-Id: <20221111052959.69F883848581@sourceware.org> Date: Fri, 11 Nov 2022 05:29:59 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fbad7a74aaaddea3d7b39045a09dd3860603658e commit r13-3891-gfbad7a74aaaddea3d7b39045a09dd3860603658e 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. 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 c086a4f1a8e..30c8322f01c 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 38c35851716..4a6e402831d 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; };