diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-12-02 12:47:11 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-12-02 12:47:11 +0000 |
| commit | dbabdb5220c44e5938d404eefb84b5ed55667ea8 (patch) | |
| tree | 75c7e5204ae0564ac641b1629ef74066461d1884 /include/type_traits | |
| parent | 8a86acebf859efb1adc46c88fa0cd69381a7291f (diff) | |
Notes
Diffstat (limited to 'include/type_traits')
| -rw-r--r-- | include/type_traits | 7 |
1 files changed, 4 insertions, 3 deletions
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> |