diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2018-01-02 18:41:01 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2018-01-02 18:41:01 +0000 |
| commit | c1ab13d9df5ff66103b00ae13d8003e67ce74786 (patch) | |
| tree | 7808999417f31655fc1093bce5ced85d00b183fc | |
| parent | c58e4723e767281311f1c926228fdf1692ad9ba6 (diff) | |
A couple more inlined variables that I missed the first time
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@321661 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/type_traits | 20 | ||||
| -rw-r--r-- | www/cxx1z_status.html | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/include/type_traits b/include/type_traits index c95bf88c2..92db181b9 100644 --- a/include/type_traits +++ b/include/type_traits @@ -4523,12 +4523,14 @@ struct _LIBCPP_TEMPLATE_VIS is_invocable_r : integral_constant<bool, __invokable_r<_Ret, _Fn, _Args...>::value> {}; template <class _Fn, class ..._Args> -constexpr bool is_invocable_v = is_invocable<_Fn, _Args...>::value; +_LIBCPP_INLINE_VAR constexpr bool is_invocable_v + = is_invocable<_Fn, _Args...>::value; template <class _Ret, class _Fn, class ..._Args> -constexpr bool is_invocable_r_v = is_invocable_r<_Ret, _Fn, _Args...>::value; +_LIBCPP_INLINE_VAR constexpr bool is_invocable_r_v + = is_invocable_r<_Ret, _Fn, _Args...>::value; -// is_nothrow_callable +// is_nothrow_invocable template <class _Fn, class ..._Args> struct _LIBCPP_TEMPLATE_VIS is_nothrow_invocable @@ -4539,10 +4541,12 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_invocable_r : integral_constant<bool, __nothrow_invokable_r<_Ret, _Fn, _Args...>::value> {}; template <class _Fn, class ..._Args> -constexpr bool is_nothrow_invocable_v = is_nothrow_invocable<_Fn, _Args...>::value; +_LIBCPP_INLINE_VAR constexpr bool is_nothrow_invocable_v + = is_nothrow_invocable<_Fn, _Args...>::value; template <class _Ret, class _Fn, class ..._Args> -constexpr bool is_nothrow_invocable_r_v = is_nothrow_invocable_r<_Ret, _Fn, _Args...>::value; +_LIBCPP_INLINE_VAR constexpr bool is_nothrow_invocable_r_v + = is_nothrow_invocable_r<_Ret, _Fn, _Args...>::value; #endif // _LIBCPP_STD_VER > 14 @@ -4682,10 +4686,12 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable }; template <class _Tp, class _Up> -constexpr bool is_swappable_with_v = is_swappable_with<_Tp, _Up>::value; +_LIBCPP_INLINE_VAR constexpr bool is_swappable_with_v + = is_swappable_with<_Tp, _Up>::value; template <class _Tp> -constexpr bool is_swappable_v = is_swappable<_Tp>::value; +_LIBCPP_INLINE_VAR constexpr bool is_swappable_v + = is_swappable<_Tp>::value; template <class _Tp, class _Up> _LIBCPP_INLINE_VAR constexpr bool is_nothrow_swappable_with_v diff --git a/www/cxx1z_status.html b/www/cxx1z_status.html index b52de8733..4fd84f471 100644 --- a/www/cxx1z_status.html +++ b/www/cxx1z_status.html @@ -171,7 +171,7 @@ <!-- <tr><td></td><td></td><td></td><td></td><td></td><td></td></tr> --> </table> -<p><i>The parts of P0607 that are not done are for <tt>has_unique_object_representations_v</tt>, <tt>is_callable_v</tt> and <tt>is_nothrow_callable_v</tt>, plus the <regex> bits.</i></p> +<p><i>The parts of P0607 that are not done are for <tt>has_unique_object_representations_v</tt>, plus the <regex> bits.</i></p> <p><i>[ Note: "Nothing to do" means that no library changes were needed to implement this change -- end note]</i></p> |