[gcc r12-7004] libstdc++: Fix invalid instantiations in tests

[gcc r12-7004] libstdc++: Fix invalid instantiations in tests

[Jonathan Wakely]

https://gcc.gnu.org/g:c123096cf14ac87875bba51279e46cceeb18faa1

commit r12-7004-gc123096cf14ac87875bba51279e46cceeb18faa1
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Feb 2 17:04:58 2022 +0000

    libstdc++: Fix invalid instantiations in tests
    
    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.

Diff:
---
 .../testsuite/23_containers/multiset/operators/cmp_c++20.cc       | 8 ++++++--
 libstdc++-v3/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