From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 912523858436; Tue, 28 Sep 2021 19:24:41 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 912523858436
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-3937] libstdc++: Fix tests that use invalid types in ordered
 containers
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 45a8cd256934be3770f7e000db7b13f10eabee9a
X-Git-Newrev: 4000d722e609bbbb1e923721b54911bb784eeec3
Message-Id: <20210928192441.912523858436@sourceware.org>
Date: Tue, 28 Sep 2021 19:24:41 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Sep 2021 19:24:41 -0000

https://gcc.gnu.org/g:4000d722e609bbbb1e923721b54911bb784eeec3

commit r12-3937-g4000d722e609bbbb1e923721b54911bb784eeec3
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Sep 24 13:21:34 2021 +0100

    libstdc++: Fix tests that use invalid types in ordered containers
    
    Types used in ordered containers need to be comparable, or the container
    needs to use a custom comparison function. These tests fail when
    _GLIBCXX_CONCEPT_CHECKS is defined, because the element types aren't
    comparable.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/20_util/is_nothrow_swappable/value.h: Use custom
            comparison function for priority_queue of type with no
            relational operators.
            * testsuite/20_util/is_swappable/value.h: Likewise.
            * testsuite/24_iterators/output/concept.cc: Add operator< to
            type used in set.

Diff:
---
 libstdc++-v3/testsuite/20_util/is_nothrow_swappable/value.h |  4 +++-
 libstdc++-v3/testsuite/20_util/is_swappable/value.h         | 11 ++++++++++-
 libstdc++-v3/testsuite/24_iterators/output/concept.cc       |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/value.h b/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/value.h
index 62b3db8dc1f..d6f166bee46 100644
--- a/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/value.h
+++ b/libstdc++-v3/testsuite/20_util/is_nothrow_swappable/value.h
@@ -285,7 +285,9 @@ void test01()
   static_assert(test_property<is_nothrow_swappable,
 		std::queue<ThrowCopyConsClass>>(true), "");
   static_assert(test_property<is_nothrow_swappable,
-		std::priority_queue<ThrowCopyConsClass>>(true), "");
+		std::priority_queue<ThrowCopyConsClass,
+				    std::vector<ThrowCopyConsClass>,
+				    comps::CompareNoThrowCopyable>>(true), "");
   static_assert(test_property<is_nothrow_swappable,
 		std::stack<ThrowCopyConsClass>>(true), "");
   static_assert(test_property<is_nothrow_swappable,
diff --git a/libstdc++-v3/testsuite/20_util/is_swappable/value.h b/libstdc++-v3/testsuite/20_util/is_swappable/value.h
index 2f7a00b9aef..eb3f96dc0b1 100644
--- a/libstdc++-v3/testsuite/20_util/is_swappable/value.h
+++ b/libstdc++-v3/testsuite/20_util/is_swappable/value.h
@@ -55,6 +55,13 @@ namespace funny {
   {
     friend void swap(F3&, F3) {}
   };
+
+  struct DummyCmp
+  {
+    template<class T>
+      bool operator()(const T&, const T&) const
+      { return false; }
+  };
 }
 void test01()
 {
@@ -152,7 +159,9 @@ void test01()
   static_assert(test_property<is_swappable,
 		std::priority_queue<int>[1][2][3]>(true), "");
   static_assert(test_property<is_swappable,
-		std::priority_queue<construct::Nontrivial>>(true), "");
+		std::priority_queue<construct::Nontrivial,
+				    std::vector<construct::Nontrivial>,
+				    funny::DummyCmp>>(true), "");
   static_assert(test_property<is_swappable,
 		std::stack<int>>(true), "");
   static_assert(test_property<is_swappable,
diff --git a/libstdc++-v3/testsuite/24_iterators/output/concept.cc b/libstdc++-v3/testsuite/24_iterators/output/concept.cc
index ddb646b22ad..a0524387dab 100644
--- a/libstdc++-v3/testsuite/24_iterators/output/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/output/concept.cc
@@ -68,7 +68,7 @@ using std::string;
 using std::string_view;
 using std::vector;
 
-struct B { };
+struct B { bool operator<(const B&) const; };
 
 static_assert( output_iterator< array<int, 1>::iterator, int > );
 static_assert( output_iterator< array<B, 1>::iterator, B > );