commit ba6c14fcf9fdcef8442e052bd0d75bfe3dc2b69a
author Christopher Di Bella <cjdb.ns@gmail.com> Thu Mar 04 22:07:45 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 04 22:15:21 2021 -0800
tree ee31616d6de6203dae329815fe65aca426aa9ad7
parent a9dfeb06b2bde1e7168f49108cc0fd16b85ef83f

[libcxx] fixes up some [concepts]-related code

* moves `std::copy_constructible` so it comes before
  `std::equality_comparable_with`
* replaces a few uses of `auto`

GitOrigin-RevId: 6eb5d55c55d176f9baf0c50d915ec4ec798c413b

include/concepts

diff --git a/include/concepts b/include/concepts
index 88a18e9..385ce09 100644
--- a/include/concepts
+++ b/include/concepts
@@ -243,6 +243,14 @@
 concept move_constructible =
   constructible_from<_Tp, _Tp> && convertible_to<_Tp, _Tp>;
 
+// [concept.copyconstructible]
+template<class _Tp>
+concept copy_constructible =
+  move_constructible<_Tp> &&
+  constructible_from<_Tp, _Tp&> && convertible_to<_Tp&, _Tp> &&
+  constructible_from<_Tp, const _Tp&> && convertible_to<const _Tp&, _Tp> &&
+  constructible_from<_Tp, const _Tp> && convertible_to<const _Tp, _Tp>;
+
 // [concept.booleantestable]
 template<class _Tp>
 concept __boolean_testable_impl = convertible_to<_Tp, bool>;
@@ -275,14 +283,6 @@
       const remove_reference_t<_Up>&>> &&
   __weakly_equality_comparable_with<_Tp, _Up>;
 
-// [concept.copyconstructible]
-template<class _Tp>
-concept copy_constructible =
-  move_constructible<_Tp> &&
-  constructible_from<_Tp, _Tp&> && convertible_to<_Tp&, _Tp> &&
-  constructible_from<_Tp, const _Tp&> && convertible_to<const _Tp&, _Tp> &&
-  constructible_from<_Tp, const _Tp> && convertible_to<const _Tp, _Tp>;
-
 // [concept.invocable]
 template<class _Fn, class... _Args>
 concept invocable = requires(_Fn&& __fn, _Args&&... __args) {