From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 4D5343985444; Wed, 17 Jun 2020 20:17:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4D5343985444 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592425060; bh=/vuMapO/rkQawwr0TQaU/IMTuERT+g1N9FpsmKIKQ64=; h=From:To:Subject:Date:From; b=d2Aub5wRlIFdWYezFe69mbBeQ4cdITV2+nkUc6V6tt3xJEPYsDNOGtoHVCD4H752y qHXpQswm52JYQU+j012tj0feRqP0BcnXSUlldNg1QPdXx+6Ltv6qWIpKbHNWGF7x3m g3lfUE7bvN0/W4Un5UEGmHu6Ez/ial4Bo0v8hcoo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Add comparison operators to types from Numerics clause X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: e4b84abcc46fb4270172584ac5a4b46d70e93259 X-Git-Newrev: ef389dadd4f082e13b076f14a123bf506e158da4 Message-Id: <20200617201740.4D5343985444@sourceware.org> Date: Wed, 17 Jun 2020 20:17:40 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2020 20:17:40 -0000 https://gcc.gnu.org/g:ef389dadd4f082e13b076f14a123bf506e158da4 commit ef389dadd4f082e13b076f14a123bf506e158da4 Author: Jonathan Wakely Date: Wed Apr 8 16:51:59 2020 +0100 libstdc++: Add comparison operators to types from Numerics clause Some more C++20 changes from P1614R2, "The Mothership has Landed". * include/bits/slice_array.h (operator==(const slice&, const slice&)): Define for C++20. * include/std/complex (operator==(const T&, const complex&)) (operator!=(const complex&, const complex&)) (operator!=(const complex&, const T&)) (operator!=(const T&, const complex&)): Do not declare for C++20. * testsuite/26_numerics/slice/compare.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 8 ++++ libstdc++-v3/include/bits/slice_array.h | 5 +++ libstdc++-v3/include/std/complex | 2 + .../testsuite/26_numerics/slice/compare.cc | 48 ++++++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fddba57d548..37ffbcf7b95 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2020-04-08 Jonathan Wakely + * include/bits/slice_array.h (operator==(const slice&, const slice&)): + Define for C++20. + * include/std/complex (operator==(const T&, const complex&)) + (operator!=(const complex&, const complex&)) + (operator!=(const complex&, const T&)) + (operator!=(const T&, const complex&)): Do not declare for C++20. + * testsuite/26_numerics/slice/compare.cc: New test. + * include/std/charconv (to_chars_result, from_chars_result): Add defaulted equality comparisons for C++20. * testsuite/20_util/from_chars/compare.cc: New test. diff --git a/libstdc++-v3/include/bits/slice_array.h b/libstdc++-v3/include/bits/slice_array.h index 32ba802c007..de33342e252 100644 --- a/libstdc++-v3/include/bits/slice_array.h +++ b/libstdc++-v3/include/bits/slice_array.h @@ -78,6 +78,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Return array stride of slice. size_t stride() const; +#if __cpp_impl_three_way_comparison >= 201907L + /// Equality comparison + friend bool operator==(const slice&, const slice&) = default; +#endif + private: size_t _M_off; // offset size_t _M_sz; // size diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 4f170dc524a..f2917b8c368 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -468,6 +468,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator==(const complex<_Tp>& __x, const _Tp& __y) { return __x.real() == __y && __x.imag() == _Tp(); } +#if !(__cpp_impl_three_way_comparison >= 201907L) template inline _GLIBCXX_CONSTEXPR bool operator==(const _Tp& __x, const complex<_Tp>& __y) @@ -490,6 +491,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline _GLIBCXX_CONSTEXPR bool operator!=(const _Tp& __x, const complex<_Tp>& __y) { return __x != __y.real() || _Tp() != __y.imag(); } +#endif //@} /// Extraction operator for complex values. diff --git a/libstdc++-v3/testsuite/26_numerics/slice/compare.cc b/libstdc++-v3/testsuite/26_numerics/slice/compare.cc new file mode 100644 index 00000000000..4459cf22eb6 --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/slice/compare.cc @@ -0,0 +1,48 @@ +// 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::slice s1(1, 2, 3); + VERIFY( s1 == s1 ); + VERIFY( !(s1 != s1) ); + std::slice s2(1, 2, 3); + VERIFY( s2 == s1 ); + VERIFY( !(s2 != s1) ); + std::slice s3(3, 2, 3); + VERIFY( s3 != s1 ); + VERIFY( !(s3 == s1) ); + std::slice s4(1, 3, 3); + VERIFY( s4 != s1 ); + VERIFY( !(s4 == s1) ); + std::slice s5(1, 2, 4); + VERIFY( s5 != s1 ); + VERIFY( !(s5 == s1) ); +} + +int +main() +{ + test01(); +}