public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] libstdc++: Add spaceship operator to std::type_index Date: Fri, 17 Jul 2020 14:26:27 +0000 (GMT) [thread overview] Message-ID: <20200717142628.049993B73010@sourceware.org> (raw) https://gcc.gnu.org/g:4714fd14afadbfdab0cc76a8b3fdf7a8161e0ebe commit 4714fd14afadbfdab0cc76a8b3fdf7a8161e0ebe Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Apr 15 19:47:47 2020 +0100 libstdc++: Add spaceship operator to std::type_index Another C++20 change from P1614R2, "The Mothership has Landed". * include/std/typeindex (operator<=>): Define for C++20. * testsuite/20_util/typeindex/comparison_operators_c++20.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 5 +++ libstdc++-v3/include/std/typeindex | 17 ++++++++ .../typeindex/comparison_operators_c++20.cc | 50 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0283cf313f0..696a423e5c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2020-04-15 Jonathan Wakely <jwakely@redhat.com> + + * include/std/typeindex (operator<=>): Define for C++20. + * testsuite/20_util/typeindex/comparison_operators_c++20.cc: New test. + 2020-04-14 Jonathan Wakely <jwakely@redhat.com> * libsupc++/compare (compare_three_way): Fix constraint so that diff --git a/libstdc++-v3/include/std/typeindex b/libstdc++-v3/include/std/typeindex index 8582c50b954..b4539f18ca0 100644 --- a/libstdc++-v3/include/std/typeindex +++ b/libstdc++-v3/include/std/typeindex @@ -36,6 +36,9 @@ #else #include <typeinfo> +#if __cplusplus > 201703L +# include <compare> +#endif namespace std _GLIBCXX_VISIBILITY(default) { @@ -58,9 +61,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator==(const type_index& __rhs) const noexcept { return *_M_target == *__rhs._M_target; } +#if ! __cpp_lib_three_way_comparison bool operator!=(const type_index& __rhs) const noexcept { return *_M_target != *__rhs._M_target; } +#endif bool operator<(const type_index& __rhs) const noexcept @@ -78,6 +83,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const type_index& __rhs) const noexcept { return !_M_target->before(*__rhs._M_target); } +#if __cpp_lib_three_way_comparison + strong_ordering + operator<=>(const type_index& __rhs) const noexcept + { + if (*_M_target == *__rhs._M_target) + return strong_ordering::equal; + if (_M_target->before(*__rhs._M_target)) + return strong_ordering::less; + return strong_ordering::greater; + } +#endif + size_t hash_code() const noexcept { return _M_target->hash_code(); } diff --git a/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators_c++20.cc b/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators_c++20.cc new file mode 100644 index 00000000000..27598c690c5 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators_c++20.cc @@ -0,0 +1,50 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +// 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 +// <http://www.gnu.org/licenses/>. + +#include <typeindex> +#include <testsuite_hooks.h> + +void test01() +{ + class Abraca { }; + Abraca a1, a2_; + const Abraca a2 = a2_; + + const std::type_index arr[] = { + typeid(int), typeid(double), typeid(Abraca), typeid(const Abraca), + typeid(const Abraca&), typeid(a1), typeid(a2) + }; + + for (const std::type_index& t1 : arr) + for (const std::type_index& t2 : arr) + { + VERIFY( (t1 == t2) == std::is_eq(t1 <=> t2) ); + VERIFY( (t1 != t2) == std::is_neq(t1 <=> t2) ); + VERIFY( (t1 < t2) == std::is_lt(t1 <=> t2) ); + VERIFY( (t1 > t2) == std::is_gt(t1 <=> t2) ); + VERIFY( (t1 <= t2) == std::is_lteq(t1 <=> t2) ); + VERIFY( (t1 >= t2) == std::is_gteq(t1 <=> t2) ); + } +} + +int main() +{ + test01(); +}
reply other threads:[~2020-07-17 14:26 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=20200717142628.049993B73010@sourceware.org \ --to=tnfchris@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: linkBe 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).