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 C4488388553D for ; Fri, 11 Nov 2022 05:31:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C4488388553D 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=1668144671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rive8M/gr/JObO1F0Cxx9PPy136aZNXI1eS27sv12eE=; b=MBD24ed+bM0jvvV6OqTR2OlDlpQzPv1159Lmc+sBfUlO13UgDbRWQGdz5mdY1aOgO9dcv3 pI7S85C/THCLySh/1OPvimPlkVzXeycITkSLMSeL6J7EXsRSTiliyPUKUQRZjpIHGZcU05 okJ5qXRHCZOj/4lPVP5OY32qQ8lNPsI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-164-9jk2ADAhNWG9xMFBYShNaQ-1; Fri, 11 Nov 2022 00:31:09 -0500 X-MC-Unique: 9jk2ADAhNWG9xMFBYShNaQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 960F1811E81; Fri, 11 Nov 2022 05:31:09 +0000 (UTC) Received: from localhost (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FB9620290AF; Fri, 11 Nov 2022 05:31:09 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix tests with non-const operator== Date: Fri, 11 Nov 2022 05:31:08 +0000 Message-Id: <20221111053108.563931-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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: Tested x86_64-linux. Pushed to trunk. -- >8 -- 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. --- 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; }; -- 2.38.1