From b5599c682f58af1b5fe886988f2d7cc9782b0129 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Mon, 30 Nov 2015 05:03:35 +0000
Subject: [PATCH] Fix bad macros in tests

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@254284 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/std/utilities/meta/meta.rel/is_base_of.pass.cpp     | 2 +-
 test/std/utilities/meta/meta.rel/is_convertible.pass.cpp | 4 ++--
 test/std/utilities/meta/meta.rel/is_same.pass.cpp        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp b/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp
index 290c1042..4b17a9f9 100644
--- a/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp
+++ b/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/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp b/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
index bc3c55a3..1681c399 100644
--- a/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
+++ b/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/test/std/utilities/meta/meta.rel/is_same.pass.cpp b/test/std/utilities/meta/meta.rel/is_same.pass.cpp
index 439c96f6..9db36739 100644
--- a/test/std/utilities/meta/meta.rel/is_same.pass.cpp
+++ b/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>), "");