Author: marshall Date: Tue Jan 2 10:41:01 2018 New Revision: 321661 URL: http://llvm.org/viewvc/llvm-project?rev=321661&view=rev Log: A couple more inlined variables that I missed the first time
Modified: libcxx/trunk/include/type_traits libcxx/trunk/www/cxx1z_status.html Modified: libcxx/trunk/include/type_traits URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=321661&r1=321660&r2=321661&view=diff ============================================================================== --- libcxx/trunk/include/type_traits (original) +++ libcxx/trunk/include/type_traits Tue Jan 2 10:41:01 2018 @@ -4523,12 +4523,14 @@ struct _LIBCPP_TEMPLATE_VIS is_invocable : 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_i : 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_s }; 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 Modified: libcxx/trunk/www/cxx1z_status.html URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/cxx1z_status.html?rev=321661&r1=321660&r2=321661&view=diff ============================================================================== --- libcxx/trunk/www/cxx1z_status.html (original) +++ libcxx/trunk/www/cxx1z_status.html Tue Jan 2 10:41:01 2018 @@ -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> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits