diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-06-21 14:43:15 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-06-21 14:43:15 +0000 |
| commit | b6a9afa8236ba4e5ebe46e1215936aab109e5612 (patch) | |
| tree | 81a61f80a08449e54ef08e644b38a6f8d759234c /libcxx/test/std/utilities | |
| parent | f7212dbe2fb4e4ac71119df9e3c4f033a1082216 (diff) | |
| download | bcm5719-llvm-b6a9afa8236ba4e5ebe46e1215936aab109e5612.tar.gz bcm5719-llvm-b6a9afa8236ba4e5ebe46e1215936aab109e5612.zip | |
Get is_convertible tests passing in C++03 (except the fallback).
llvm-svn: 364057
Diffstat (limited to 'libcxx/test/std/utilities')
| -rw-r--r-- | libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp | 9 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp | 2 |
2 files changed, 3 insertions, 8 deletions
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 b1722b0fcec..89ca47fb96b 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<Function, Function*> (); test_is_convertible<Function, Function*const> (); -#if TEST_STD_VER >= 11 static_assert(( std::is_convertible<Function, Function&&>::value), ""); -#endif test_is_not_convertible<Function, Array> (); test_is_not_convertible<Function, Array&> (); @@ -119,9 +117,7 @@ int main(int, char**) static_assert((!std::is_convertible<ConstFunction, Function>::value), ""); static_assert((!std::is_convertible<ConstFunction, Function*>::value), ""); static_assert((!std::is_convertible<ConstFunction, Function&>::value), ""); -#if TEST_STD_VER >= 11 static_assert((!std::is_convertible<ConstFunction, Function&&>::value), ""); -#endif static_assert((!std::is_convertible<Function*, ConstFunction>::value), ""); static_assert((!std::is_convertible<Function&, ConstFunction>::value), ""); static_assert((!std::is_convertible<ConstFunction, ConstFunction>::value), ""); @@ -143,7 +139,6 @@ int main(int, char**) static_assert((!std::is_convertible<Array, volatile Array&>::value), ""); static_assert((!std::is_convertible<Array, const volatile Array&>::value), ""); -#if TEST_STD_VER >= 11 static_assert(( std::is_convertible<Array, Array&&>::value), ""); static_assert(( std::is_convertible<Array, const Array&&>::value), ""); static_assert(( std::is_convertible<Array, volatile Array&&>::value), ""); @@ -151,7 +146,6 @@ int main(int, char**) static_assert(( std::is_convertible<const Array, const Array&&>::value), ""); static_assert((!std::is_convertible<Array&, Array&&>::value), ""); static_assert((!std::is_convertible<Array&&, Array&>::value), ""); -#endif test_is_not_convertible<Array, char> (); test_is_not_convertible<Array, char&> (); @@ -252,9 +246,8 @@ int main(int, char**) static_assert((!std::is_convertible<const NonCopyable&, NonCopyable&>::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<NonCopyable&, NonCopyable>(); -#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 b75b4468a70..cba926ee006 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 |
