Index: include/type_traits =================================================================== --- include/type_traits +++ include/type_traits @@ -848,7 +848,16 @@ namespace __is_convertible_imp { -template char __test(_Tp); +template void __test_convert(_Tp); + +template +struct __is_convertible_test : public false_type {}; + +template +struct __is_convertible_test<_From, _To, + decltype(__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type +{}; + template __two __test(...); #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES template _Tp&& __source(); @@ -883,10 +892,8 @@ unsigned _T2_is_array_function_or_void = __is_convertible_imp::__is_array_function_or_void<_T2>::value> struct __is_convertible : public integral_constant(__is_convertible_imp::__source<_T1>())) == 1 -#else - sizeof(__is_convertible_imp::__test<_T2>(__is_convertible_imp::__source<_T1>())) == 1 + __is_convertible_imp::__is_convertible_test<_T1, _T2>::value +#if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !(!is_function<_T1>::value && !is_reference<_T1>::value && is_reference<_T2>::value && (!is_const::type>::value || is_volatile::type>::value) Index: test/std/utilities/meta/meta.rel/is_convertible.pass.cpp =================================================================== --- test/std/utilities/meta/meta.rel/is_convertible.pass.cpp +++ test/std/utilities/meta/meta.rel/is_convertible.pass.cpp @@ -186,4 +186,10 @@ static_assert((std::is_convertible::value), ""); static_assert((std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); +// This test requires Access control SFINAE which we only have in C++11 or when +// we are using the compiler builtin for is_convertible. +#if __cplusplus >= 201103L || !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) + test_is_not_convertible(); +#endif + }