From 803a8bb105421fc81673facf5793314252fc583d Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 30 Nov 2015 05:03:35 +0000 Subject: [PATCH] Fix bad macros in tests llvm-svn: 254284 --- libcxx/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp | 2 +- .../test/std/utilities/meta/meta.rel/is_convertible.pass.cpp | 4 ++-- libcxx/test/std/utilities/meta/meta.rel/is_same.pass.cpp | 4 ++-- 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 290c104226be..4b17a9f96505 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::value), ""); static_assert((std::is_base_of::value), ""); static_assert((std::is_base_of::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_base_of_v), ""); static_assert((std::is_base_of_v), ""); static_assert((std::is_base_of_v), ""); 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 bc3c55a33d3c..1681c39972d2 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::value), ""); static_assert((std::is_convertible::value), ""); static_assert((std::is_convertible::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_convertible_v), ""); static_assert((std::is_convertible_v), ""); static_assert((std::is_convertible_v), ""); @@ -37,7 +37,7 @@ void test_is_not_convertible() static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); static_assert((!std::is_convertible::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((!std::is_convertible_v), ""); static_assert((!std::is_convertible_v), ""); static_assert((!std::is_convertible_v), ""); 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 439c96f656e4..9db367391f69 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::value), ""); static_assert((!std::is_same::value), ""); static_assert(( std::is_same::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert(( std::is_same_v), ""); static_assert((!std::is_same_v), ""); static_assert((!std::is_same_v), ""); @@ -37,7 +37,7 @@ void test_is_same_ref() static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_same_v), ""); static_assert((std::is_same_v), ""); static_assert((std::is_same_v), "");