diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-11-30 05:03:35 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-11-30 05:03:35 +0000 |
| commit | 803a8bb105421fc81673facf5793314252fc583d (patch) | |
| tree | 28fc101512c54f2a3465b13765df94f8d8f86b2d | |
| parent | e12a536d76219019af68a8a401764dc082e736e8 (diff) | |
| download | bcm5719-llvm-803a8bb105421fc81673facf5793314252fc583d.tar.gz bcm5719-llvm-803a8bb105421fc81673facf5793314252fc583d.zip | |
Fix bad macros in tests
llvm-svn: 254284
3 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp index 290c104226b..4b17a9f9650 100644 --- a/libcxx/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp @@ -22,7 +22,7 @@ void test_is_base_of() static_assert((std::is_base_of<const T, U>::value), ""); static_assert((std::is_base_of<T, const U>::value), ""); static_assert((std::is_base_of<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_base_of_v<T, U>), ""); static_assert((std::is_base_of_v<const T, U>), ""); static_assert((std::is_base_of_v<T, const U>), ""); 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 bc3c55a33d3..1681c39972d 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 @@ -22,7 +22,7 @@ void test_is_convertible() static_assert((std::is_convertible<const T, U>::value), ""); static_assert((std::is_convertible<T, const U>::value), ""); static_assert((std::is_convertible<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_convertible_v<T, U>), ""); static_assert((std::is_convertible_v<const T, U>), ""); static_assert((std::is_convertible_v<T, const U>), ""); @@ -37,7 +37,7 @@ void test_is_not_convertible() static_assert((!std::is_convertible<const T, U>::value), ""); static_assert((!std::is_convertible<T, const U>::value), ""); static_assert((!std::is_convertible<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((!std::is_convertible_v<T, U>), ""); static_assert((!std::is_convertible_v<const T, U>), ""); static_assert((!std::is_convertible_v<T, const U>), ""); diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_same.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_same.pass.cpp index 439c96f656e..9db367391f6 100644 --- a/libcxx/test/std/utilities/meta/meta.rel/is_same.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.rel/is_same.pass.cpp @@ -22,7 +22,7 @@ void test_is_same() static_assert((!std::is_same<const T, U>::value), ""); static_assert((!std::is_same<T, const U>::value), ""); static_assert(( std::is_same<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert(( std::is_same_v<T, U>), ""); static_assert((!std::is_same_v<const T, U>), ""); static_assert((!std::is_same_v<T, const U>), ""); @@ -37,7 +37,7 @@ void test_is_same_ref() static_assert((std::is_same<const T, U>::value), ""); static_assert((std::is_same<T, const U>::value), ""); static_assert((std::is_same<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_same_v<T, U>), ""); static_assert((std::is_same_v<const T, U>), ""); static_assert((std::is_same_v<T, const U>), ""); |
