From 303b2264579de25b5d1491bc1684638a1a351126 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 24 Apr 2019 17:25:21 +0100
Subject: [PATCH] Use __and_v<...> instead of __and_<...>::value

	* include/std/any (any::any(ValueType&&)): Use __and_v.
	* include/std/numeric (midpoint(T, T, T), midpoint(T*, T*, T*)):
	Likewise.

From-SVN: r270552
---
 libstdc++-v3/ChangeLog           | 4 ++++
 libstdc++-v3/include/std/any     | 6 +++---
 libstdc++-v3/include/std/numeric | 7 +++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 913c8ebf66c..33b6371bd0d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2019-04-24  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/std/any (any::any(ValueType&&)): Use __and_v.
+	* include/std/numeric (midpoint(T, T, T), midpoint(T*, T*, T*)):
+	Likewise.
+
 	* include/std/tuple (apply): Use remove_reference_t instead of decay_t
 	as per P0777R1.
 	* include/std/type_traits (__result_of_memfun): Use remove_reference
diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any
index 29fe03e2b82..8cbabdddd9b 100644
--- a/libstdc++-v3/include/std/any
+++ b/libstdc++-v3/include/std/any
@@ -189,9 +189,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     /// Construct with a copy of @p __value as the contained object.
     template <typename _ValueType, typename _Tp = _Decay<_ValueType>,
 	      typename _Mgr = _Manager<_Tp>,
-              enable_if_t<__and_<is_copy_constructible<_Tp>,
-				 __not_<is_constructible<_Tp, _ValueType&&>>,
-			         __not_<__is_in_place_type<_Tp>>>::value,
+              enable_if_t<__and_v<is_copy_constructible<_Tp>,
+				  __not_<is_constructible<_Tp, _ValueType&&>>,
+				  __not_<__is_in_place_type<_Tp>>>,
 			  bool> = false>
       any(_ValueType&& __value)
       : _M_manager(&_Mgr::_S_manage)
diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric
index ffd9eae9691..4858ad1aea3 100644
--- a/libstdc++-v3/include/std/numeric
+++ b/libstdc++-v3/include/std/numeric
@@ -162,8 +162,8 @@ namespace __detail
 
 template<typename _Tp>
     constexpr
-    enable_if_t<__and_<is_arithmetic<_Tp>, is_same<remove_cv_t<_Tp>, _Tp>,
-		       __not_<is_same<_Tp, bool>>>::value,
+    enable_if_t<__and_v<is_arithmetic<_Tp>, is_same<remove_cv_t<_Tp>, _Tp>,
+			__not_<is_same<_Tp, bool>>>,
 		_Tp>
     midpoint(_Tp __a, _Tp __b) noexcept
     {
@@ -192,8 +192,7 @@ template<typename _Tp>
 
   template<typename _Tp>
     constexpr
-    enable_if_t<__and_<is_object<_Tp>, bool_constant<sizeof(_Tp) != 0>>::value,
-		_Tp*>
+    enable_if_t<__and_v<is_object<_Tp>, bool_constant<sizeof(_Tp) != 0>>, _Tp*>
     midpoint(_Tp* __a, _Tp* __b) noexcept
     {
       return __a > __b ? __b + (__a - __b) / 2 : __a + (__b - __a) / 2;
-- 
2.30.2