Get is_convertible tests passing in C++03 (except the fallback).
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@364057 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp b/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
index b1722b0..89ca47f 100644
--- a/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
+++ b/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
@@ -81,9 +81,7 @@
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 @@
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 @@
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 @@
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 @@
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/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp b/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
index b75b446..cba926e 100644
--- a/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
+++ b/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// type_traits
// is_convertible
