From 717e91dbc44c6bf55a498f45f6045191ceb10a11 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 19 Apr 2020 21:30:15 +0100 Subject: [PATCH] libstdc++: Define operator<=> for std::stack and std::queue Some more C++20 changes from P1614R2, "The Mothership has Landed". * include/bits/stl_queue.h (queue): Define operator<=> for C++20. * include/bits/stl_stack.h (stack): Likewise. * testsuite/23_containers/queue/cmp_c++20.cc: New test. * testsuite/23_containers/stack/cmp_c++20.cc: New test. --- libstdc++-v3/ChangeLog | 5 ++ libstdc++-v3/include/bits/stl_queue.h | 13 ++++ libstdc++-v3/include/bits/stl_stack.h | 13 ++++ .../23_containers/queue/cmp_c++20.cc | 60 +++++++++++++++++++ .../23_containers/stack/cmp_c++20.cc | 60 +++++++++++++++++++ 5 files changed, 151 insertions(+) create mode 100644 libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc create mode 100644 libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f7e0022e38f..fde5ac1bf37 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-04-19 Jonathan Wakely + * include/bits/stl_queue.h (queue): Define operator<=> for C++20. + * include/bits/stl_stack.h (stack): Likewise. + * testsuite/23_containers/queue/cmp_c++20.cc: New test. + * testsuite/23_containers/stack/cmp_c++20.cc: New test. + * include/bits/unordered_map.h (unordered_map, unordered_multimap): Remove redundant operator!= for C++20. * include/bits/unordered_set.h (unordered_set, unordered_multiset): diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index d2b2705c7c3..8635d426790 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -114,6 +114,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION friend bool operator<(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&); +#if __cpp_lib_three_way_comparison + template + friend compare_three_way_result_t<_Seq1> + operator<=>(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&); +#endif + #if __cplusplus >= 201103L template using _Uses = typename @@ -380,6 +386,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return !(__x < __y); } +#if __cpp_lib_three_way_comparison + template + inline compare_three_way_result_t<_Seq> + operator<=>(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) + { return __x.c <=> __y.c; } +#endif + #if __cplusplus >= 201103L template inline diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 355966a90e0..1ce98a94ab9 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -116,6 +116,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION friend bool operator<(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&); +#if __cpp_lib_three_way_comparison + template + friend compare_three_way_result_t<_Seq1> + operator<=>(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&); +#endif + #if __cplusplus >= 201103L template using _Uses = typename @@ -355,6 +361,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y) { return !(__x < __y); } +#if __cpp_lib_three_way_comparison + template + inline compare_three_way_result_t<_Seq> + operator<=>(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y) + { return __x.c <=> __y.c; } +#endif + #if __cplusplus >= 201103L template inline diff --git a/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc new file mode 100644 index 00000000000..5d0d4c9749e --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc @@ -0,0 +1,60 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include + +void +test01() +{ + std::queue c1{ {1, 2, 3} }, c2{ {1, 2, 3, 4} }, c3{ {1, 2, 4} }; + VERIFY( c1 == c1 ); + VERIFY( std::is_eq(c1 <=> c1) ); + VERIFY( c1 < c2 ); + VERIFY( std::is_lt(c1 <=> c2) ); + VERIFY( c1 < c3 ); + VERIFY( std::is_lt(c1 <=> c3) ); + VERIFY( c2 < c3 ); + VERIFY( std::is_lt(c2 <=> c3) ); + + static_assert( std::totally_ordered> ); + + static_assert( std::three_way_comparable, + std::strong_ordering> ); + static_assert( ! std::three_way_comparable, + std::strong_ordering> ); + static_assert( ! std::three_way_comparable, + std::weak_ordering> ); + static_assert( std::three_way_comparable, + std::partial_ordering> ); + + struct E + { + bool operator==(E) { return true; } + }; + static_assert( ! std::three_way_comparable ); + static_assert( ! std::three_way_comparable> ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc new file mode 100644 index 00000000000..054e487751f --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc @@ -0,0 +1,60 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include + +void +test01() +{ + std::stack c1{ {1, 2, 3} }, c2{ {1, 2, 3, 4} }, c3{ {1, 2, 4} }; + VERIFY( c1 == c1 ); + VERIFY( std::is_eq(c1 <=> c1) ); + VERIFY( c1 < c2 ); + VERIFY( std::is_lt(c1 <=> c2) ); + VERIFY( c1 < c3 ); + VERIFY( std::is_lt(c1 <=> c3) ); + VERIFY( c2 < c3 ); + VERIFY( std::is_lt(c2 <=> c3) ); + + static_assert( std::totally_ordered> ); + + static_assert( std::three_way_comparable, + std::strong_ordering> ); + static_assert( ! std::three_way_comparable, + std::strong_ordering> ); + static_assert( ! std::three_way_comparable, + std::weak_ordering> ); + static_assert( std::three_way_comparable, + std::partial_ordering> ); + + struct E + { + bool operator==(E) { return true; } + }; + static_assert( ! std::three_way_comparable ); + static_assert( ! std::three_way_comparable> ); +} + +int +main() +{ + test01(); +} -- 2.30.2