From dbabdb5220c44e5938d404eefb84b5ed55667ea8 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 2 Dec 2017 12:47:11 +0000
Subject: Vendor import of libc++ release_50 branch r319231:
 https://llvm.org/svn/llvm-project/libcxx/branches/release_50@319231

---
 include/type_traits | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include/type_traits')

diff --git a/include/type_traits b/include/type_traits
index 9db4d66145fc..6c111abfd1e8 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -4339,8 +4339,8 @@ struct __invokable_r
     using _Result = decltype(
         _VSTD::__invoke(_VSTD::declval<_Fp>(), _VSTD::declval<_Args>()...));
 
-    static const bool value =
-        conditional<
+    using type =
+        typename conditional<
             !is_same<_Result, __nat>::value,
             typename conditional<
                 is_void<_Ret>::value,
@@ -4348,7 +4348,8 @@ struct __invokable_r
                 is_convertible<_Result, _Ret>
             >::type,
             false_type
-        >::type::value;
+        >::type;
+    static const bool value = type::value;
 };
 
 template <class _Fp, class ..._Args>
-- 
cgit v1.3