From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 981243959C69; Wed, 17 Jun 2020 19:02:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 981243959C69 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592420531; bh=ogcM990atn3fR6N4R2h8Wq04s+9sjJpMAmR7oMOM4wY=; h=From:To:Subject:Date:From; b=aEso9HyfWabBg1vfpW4uHDRElDK3WXSQkkcGjH7xqaAX2oi5dNYOeHFPH5Mhc4TBb ieMB5/YdAPJzc43kmUzjptpbRu9yowII9s2qE/Qe00fTRhd8+8j5VRXrlxko3D1KmJ M3jfEt/wurb8zlVGCxK4Wvr3GEF4afSW0Jgt1WHk= 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++: Simplify std::totally_ordered_with (LWG 3329) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: 77f5310f0205714538668b88fbf1de44f1f435be X-Git-Newrev: 241ed965509ac931e9ae5f331d0294c1ee4ccd89 Message-Id: <20200617190211.981243959C69@sourceware.org> Date: Wed, 17 Jun 2020 19:02:11 +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 19:02:11 -0000 https://gcc.gnu.org/g:241ed965509ac931e9ae5f331d0294c1ee4ccd89 commit 241ed965509ac931e9ae5f331d0294c1ee4ccd89 Author: Jonathan Wakely Date: Wed Feb 19 21:31:06 2020 +0000 libstdc++: Simplify std::totally_ordered_with (LWG 3329) * include/std/concepts (totally_ordered_with): Remove redundant requirement (LWG 3329). Diff: --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/concepts | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6e22536680f..3941bcbe7ba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-19 Jonathan Wakely + * include/std/concepts (totally_ordered_with): Remove redundant + requirement (LWG 3329). + * include/std/ranges (__detail::__convertible_to_non_slicing): New helper concept. (__detail::__pair_like_convertible_to): Remove. diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/concepts index f3db40b798f..be125c636a1 100644 --- a/libstdc++-v3/include/std/concepts +++ b/libstdc++-v3/include/std/concepts @@ -311,10 +311,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template concept totally_ordered_with = totally_ordered<_Tp> && totally_ordered<_Up> - && common_reference_with<__detail::__cref<_Tp>, __detail::__cref<_Up>> + && equality_comparable_with<_Tp, _Up> && totally_ordered, __detail::__cref<_Up>>> - && equality_comparable_with<_Tp, _Up> && requires(__detail::__cref<_Tp> __t, __detail::__cref<_Up> __u) { { __t < __u } -> __detail::__boolean_testable; { __t > __u } -> __detail::__boolean_testable;