* [committed] libstdc++: Fix invalid instantiations in tests
@ 2022-02-02 17:38 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2022-02-02 17:38 UTC (permalink / raw)
To: libstdc++, gcc-patches
Tested x86_64-linux, pushed to trunk.
These tests instantiate std::multiset and std::set with a type that has
no operator< so they should use a custom comparison function.
libstdc++-v3/ChangeLog:
* testsuite/23_containers/multiset/operators/cmp_c++20.cc: Use
custom comparison function for multiset.
* testsuite/23_containers/set/operators/cmp_c++20.cc: Use custom
comparison function for set.
---
.../23_containers/multiset/operators/cmp_c++20.cc | 8 ++++++--
.../testsuite/23_containers/set/operators/cmp_c++20.cc | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc
index 3972f756af9..ad3ab787946 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc
@@ -49,9 +49,13 @@ test01()
{
bool operator==(E) { return true; }
};
- static_assert( ! std::totally_ordered<std::multiset<E>> );
+ struct Cmp
+ {
+ bool operator()(E, E) const { return false; }
+ };
+ static_assert( ! std::totally_ordered<std::multiset<E, Cmp>> );
static_assert( ! std::three_way_comparable<E> );
- static_assert( ! std::three_way_comparable<std::multiset<E>> );
+ static_assert( ! std::three_way_comparable<std::multiset<E, Cmp>> );
}
void
diff --git a/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc
index fdcb5db699d..58698bf426f 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc
@@ -49,9 +49,13 @@ test01()
{
bool operator==(E) { return true; }
};
- static_assert( ! std::totally_ordered<std::set<E>> );
+ struct Cmp
+ {
+ bool operator()(E, E) const { return false; }
+ };
+ static_assert( ! std::totally_ordered<std::set<E, Cmp>> );
static_assert( ! std::three_way_comparable<E> );
- static_assert( ! std::three_way_comparable<std::set<E>> );
+ static_assert( ! std::three_way_comparable<std::set<E, Cmp>> );
}
void
--
2.34.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-02 17:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-02 17:38 [committed] libstdc++: Fix invalid instantiations in tests Jonathan Wakely
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).