From 12dff9e66aa0886a02eb511c0ee35332e15428ac Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Mon, 30 Nov 2015 05:20:00 +0000
Subject: Fix bugs in alignment_of_v, etc. Re-enable the newly added tests

llvm-svn: 254289
---
 .../meta/meta.unary.prop.query/alignment_of.pass.cpp     |  8 ++++----
 .../utilities/meta/meta.unary.prop.query/extent.pass.cpp | 16 ++++++++--------
 .../utilities/meta/meta.unary.prop.query/rank.pass.cpp   |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'libcxx/test/std/utilities/meta')

diff --git a/libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
index 4929a2d3eb3..0f55db64719 100644
--- a/libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
@@ -24,10 +24,10 @@ void test_alignment_of()
     static_assert( std::alignment_of<volatile T>::value == A, "");
     static_assert( std::alignment_of<const volatile T>::value == A, "");
 #if TEST_STD_VER > 14
-//     static_assert( std::alignment_of_v<T> == A, "");
-//     static_assert( std::alignment_of_v<const T> == A, "");
-//     static_assert( std::alignment_of_v<volatile T> == A, "");
-//     static_assert( std::alignment_of_v<const volatile T> == A, "");
+    static_assert( std::alignment_of_v<T> == A, "");
+    static_assert( std::alignment_of_v<const T> == A, "");
+    static_assert( std::alignment_of_v<volatile T> == A, "");
+    static_assert( std::alignment_of_v<const volatile T> == A, "");
 #endif
 }
 
diff --git a/libcxx/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
index 60bf5aee196..39a7c2b593b 100644
--- a/libcxx/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
@@ -23,10 +23,10 @@ void test_extent()
     static_assert((std::extent<volatile T>::value == A), "");
     static_assert((std::extent<const volatile T>::value == A), "");
 #if TEST_STD_VER > 14
-//     static_assert((std::extent_v<T> == A), "");
-//     static_assert((std::extent_v<const T> == A), "");
-//     static_assert((std::extent_v<volatile T> == A), "");
-//     static_assert((std::extent_v<const volatile T> == A), "");
+    static_assert((std::extent_v<T> == A), "");
+    static_assert((std::extent_v<const T> == A), "");
+    static_assert((std::extent_v<volatile T> == A), "");
+    static_assert((std::extent_v<const volatile T> == A), "");
 #endif
 }
 
@@ -38,10 +38,10 @@ void test_extent1()
     static_assert((std::extent<volatile T, 1>::value == A), "");
     static_assert((std::extent<const volatile T, 1>::value == A), "");
 #if TEST_STD_VER > 14
-//     static_assert((std::extent_v<T, 1> == A), "");
-//     static_assert((std::extent_v<const T, 1> == A), "");
-//     static_assert((std::extent_v<volatile T, 1> == A), "");
-//     static_assert((std::extent_v<const volatile T, 1> == A), "");
+    static_assert((std::extent_v<T, 1> == A), "");
+    static_assert((std::extent_v<const T, 1> == A), "");
+    static_assert((std::extent_v<volatile T, 1> == A), "");
+    static_assert((std::extent_v<const volatile T, 1> == A), "");
 #endif
 }
 
diff --git a/libcxx/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
index 5d062eedfe3..755269d1d40 100644
--- a/libcxx/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
@@ -23,10 +23,10 @@ void test_rank()
     static_assert( std::rank<volatile T>::value == A, "");
     static_assert( std::rank<const volatile T>::value == A, "");
 #if TEST_STD_VER > 14
-//     static_assert( std::rank_v<T> == A, "");
-//     static_assert( std::rank_v<const T> == A, "");
-//     static_assert( std::rank_v<volatile T> == A, "");
-//     static_assert( std::rank_v<const volatile T> == A, "");
+    static_assert( std::rank_v<T> == A, "");
+    static_assert( std::rank_v<const T> == A, "");
+    static_assert( std::rank_v<volatile T> == A, "");
+    static_assert( std::rank_v<const volatile T> == A, "");
 #endif
 }
 
-- 
cgit v1.2.3