diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp index b1722b0fceca..89ca47fb96b1 100644 --- a/libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp @@ -81,9 +81,7 @@ int main(int, char**) test_is_convertible (); test_is_convertible (); -#if TEST_STD_VER >= 11 static_assert(( std::is_convertible::value), ""); -#endif test_is_not_convertible (); test_is_not_convertible (); @@ -119,9 +117,7 @@ int main(int, char**) static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); -#if TEST_STD_VER >= 11 static_assert((!std::is_convertible::value), ""); -#endif static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); @@ -143,7 +139,6 @@ int main(int, char**) static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); -#if TEST_STD_VER >= 11 static_assert(( std::is_convertible::value), ""); static_assert(( std::is_convertible::value), ""); static_assert(( std::is_convertible::value), ""); @@ -151,7 +146,6 @@ int main(int, char**) static_assert(( std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); -#endif test_is_not_convertible (); test_is_not_convertible (); @@ -252,9 +246,8 @@ int main(int, char**) 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 TEST_STD_VER >= 11 || !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK) test_is_not_convertible(); -#endif + // Ensure that CannotInstantiate is not instantiated by is_convertible when it is not needed. // For example CannotInstantiate is instatiated as a part of ADL lookup for arguments of type CannotInstantiate*. diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp index b75b4468a70a..cba926ee0061 100644 --- a/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + // type_traits // is_convertible