public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-9122] libstdc++: Fix test that fails for C++20
Date: Tue, 12 Oct 2021 16:24:08 +0000 (GMT)	[thread overview]
Message-ID: <20211012162408.EC85A385700D@sourceware.org> (raw)

https://gcc.gnu.org/g:8104d4fff6202dabcb2eef7406f64d26f97f341d

commit r11-9122-g8104d4fff6202dabcb2eef7406f64d26f97f341d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Oct 12 15:39:18 2021 +0100

    libstdc++: Fix test that fails for C++20
    
    Restore the test for 'a < a' that was removed by r12-2537 because
    it is ill-formed. We still want to test operator< for tuple, we just
    need to not use std::nullptr_t in that tuple type.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/20_util/tuple/comparison_operators/overloaded.cc:
            Restore test for operator<.
    
    (cherry picked from commit 727137d6ca6d3d401a0c1b4df6b9aae8b97dacd5)

Diff:
---
 .../testsuite/20_util/tuple/comparison_operators/overloaded.cc     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc
index a25c374a932..a9bc2c7dfb5 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc
@@ -48,4 +48,9 @@ TwistedLogic operator<(const Compares&, const Compares&) { return {false}; }
 
 auto a = std::make_tuple(nullptr, Compares{}, 2, 'U');
 auto b = a == a;
-auto c = a < a;
+
+#if ! __cpp_lib_three_way_comparison
+// Not valid in C++20, because TwistedLogic doesn't model boolean-testable.
+auto c = std::make_tuple("", Compares{}, 2, 'U');
+auto d = c < c;
+#endif


                 reply	other threads:[~2021-10-12 16:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211012162408.EC85A385700D@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).