From 95f8e6aa5529396ccfc81402ae3fc518571292ee Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 19 Apr 2017 00:56:32 +0000
Subject: [PATCH] Cleanup _LIBCPP_HAS_NO_<c++11-feature> in the utilities
 library

llvm-svn: 300635
---
 .../std/utilities/meta/meta.help/integral_constant.pass.cpp | 6 +++---
 .../meta/meta.trans/meta.trans.other/aligned_union.pass.cpp | 4 ++--
 .../time.duration/time.duration.arithmetic/op_+.pass.cpp    | 2 +-
 .../time.duration/time.duration.arithmetic/op_-.pass.cpp    | 2 +-
 .../time.duration/time.duration.cast/duration_cast.pass.cpp | 4 +++-
 .../time.duration.comparisons/op_equal.pass.cpp             | 4 +++-
 .../time.duration.comparisons/op_less.pass.cpp              | 4 +++-
 .../time.duration/time.duration.cons/convert_exact.pass.cpp | 4 +++-
 .../time.duration.cons/convert_inexact.pass.cpp             | 4 +++-
 .../time.duration.cons/convert_int_to_float.pass.cpp        | 4 +++-
 .../time/time.duration/time.duration.cons/default.pass.cpp  | 3 ++-
 .../time/time.duration/time.duration.cons/rep.pass.cpp      | 3 ++-
 .../time/time.duration/time.duration.cons/rep02.pass.cpp    | 4 +++-
 .../time.duration/time.duration.nonmember/op_+.pass.cpp     | 4 +++-
 .../time.duration/time.duration.nonmember/op_-.pass.cpp     | 4 +++-
 .../time.duration.nonmember/op_divide_duration.pass.cpp     | 4 +++-
 .../time.duration.nonmember/op_divide_rep.pass.cpp          | 4 +++-
 .../time.duration.nonmember/op_mod_duration.pass.cpp        | 4 +++-
 .../time.duration.nonmember/op_mod_rep.pass.cpp             | 4 +++-
 .../time.duration.nonmember/op_times_rep.pass.cpp           | 4 +++-
 .../time/time.duration/time.duration.special/max.pass.cpp   | 3 ++-
 .../time/time.duration/time.duration.special/min.pass.cpp   | 3 ++-
 .../time/time.duration/time.duration.special/zero.pass.cpp  | 3 ++-
 .../time.traits/time.traits.duration_values/max.pass.cpp    | 3 ++-
 .../time.traits/time.traits.duration_values/min.pass.cpp    | 3 ++-
 .../time.traits/time.traits.duration_values/zero.pass.cpp   | 3 ++-
 .../tuple/tuple.tuple/tuple.cnstr/default.pass.cpp          | 2 --
 .../pairs/pair.piecewise/piecewise_construct.pass.cpp       | 4 ++--
 .../utilities/utility/pairs/pairs.pair/piecewise.pass.cpp   | 4 ++--
 29 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/libcxx/test/std/utilities/meta/meta.help/integral_constant.pass.cpp b/libcxx/test/std/utilities/meta/meta.help/integral_constant.pass.cpp
index 51a837e4e032..bf8aa0453e97 100644
--- a/libcxx/test/std/utilities/meta/meta.help/integral_constant.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.help/integral_constant.pass.cpp
@@ -22,11 +22,11 @@ int main()
     static_assert(_5::value == 5, "");
     static_assert((std::is_same<_5::value_type, int>::value), "");
     static_assert((std::is_same<_5::type, _5>::value), "");
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     static_assert((_5() == 5), "");
-#else
-    assert(_5() == 5);
 #endif
+    assert(_5() == 5);
+
 
 #if TEST_STD_VER > 11
     static_assert ( _5{}() == 5, "" );
diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp
index 43f23f5ccc80..883548270469 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03
+
 // type_traits
 
 // aligned_union<size_t Len, class ...Types>
@@ -17,7 +19,6 @@
 
 int main()
 {
-#ifndef _LIBCPP_HAS_NO_VARIADICS
     {
     typedef std::aligned_union<10, char >::type T1;
 #if TEST_STD_VER > 11
@@ -90,5 +91,4 @@ int main()
     static_assert(std::alignment_of<T1>::value == 4, "");
     static_assert(sizeof(T1) == 4, "");
     }
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
index b85f039526a4..37753bcad0d1 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
@@ -16,7 +16,7 @@
 #include <chrono>
 #include <cassert>
 
-#include <test_macros.h>
+#include "test_macros.h"
 
 int main()
 {
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
index 347cc1980e81..f932eb51c0d5 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
@@ -16,7 +16,7 @@
 #include <chrono>
 #include <cassert>
 
-#include <test_macros.h>
+#include "test_macros.h"
 
 int main()
 {
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
index 1c87fcd909ef..9ecdfc750ab0 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
@@ -20,6 +20,8 @@
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 template <class ToDuration, class FromDuration>
 void
 test(const FromDuration& f, const ToDuration& d)
@@ -43,7 +45,7 @@ int main()
          std::chrono::duration<double, std::ratio<3600> >(7265./3600));
     test(std::chrono::duration<int, std::ratio<2, 3> >(9),
          std::chrono::duration<int, std::ratio<3, 5> >(10));
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::hours h = std::chrono::duration_cast<std::chrono::hours>(std::chrono::milliseconds(7265000));
     static_assert(h.count() == 2, "");
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
index 2d0dd94d4cf6..5adc62ff1c5f 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
@@ -24,6 +24,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -68,7 +70,7 @@ int main()
     assert(s1 == s2);
     assert(!(s1 != s2));
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::seconds s1(3);
     constexpr std::chrono::seconds s2(3);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
index 9d875579f326..42e798254208 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
@@ -34,6 +34,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -92,7 +94,7 @@ int main()
     assert( (s1 <= s2));
     assert( (s1 >= s2));
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::seconds s1(3);
     constexpr std::chrono::seconds s2(3);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
index 152227d82a82..c237fd7716f3 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -26,7 +28,7 @@ int main()
     std::chrono::microseconds us = ms;
     assert(us.count() == 1000);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::milliseconds ms(1);
     constexpr std::chrono::microseconds us = ms;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
index 519b2b141c29..4b5042df2ce2 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -26,7 +28,7 @@ int main()
     std::chrono::duration<double, std::milli> ms = us;
     assert(ms.count() == 1./1000);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::duration<double, std::micro> us(1);
     constexpr std::chrono::duration<double, std::milli> ms = us;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
index 59fefe2e002d..8e5938b9e4b3 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -26,7 +28,7 @@ int main()
     std::chrono::duration<double, std::milli> d = i;
     assert(d.count() == 3000);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::duration<int> i(3);
     constexpr std::chrono::duration<double, std::milli> d = i;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp
index c52990961c25..4f7d67bb630c 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp
@@ -18,6 +18,7 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 template <class D>
@@ -26,7 +27,7 @@ test()
 {
     D d;
     assert(d.count() == typename D::rep());
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     constexpr D d2 = D();
     static_assert(d2.count() == typename D::rep(), "");
 #endif
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
index 20f81619bd12..6ad743e714c2 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
@@ -17,6 +17,7 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 template <class D, class R>
@@ -25,7 +26,7 @@ test(R r)
 {
     D d(r);
     assert(d.count() == r);
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     constexpr D d2(R(2));
     static_assert(d2.count() == 2, "");
 #endif
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
index b3ba9f7081e4..ae745a76f431 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
@@ -19,11 +19,13 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     std::chrono::duration<double> d(5);
     assert(d.count() == 5);
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     constexpr std::chrono::duration<double> d2(5);
     static_assert(d2.count() == 5, "");
 #endif
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
index 6585351cb4c8..6859ffcb208a 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
@@ -18,6 +18,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -44,7 +46,7 @@ int main()
     std::chrono::duration<double, std::ratio<1, 15> > r = s1 + s2;
     assert(r.count() == 75);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::seconds s1(3);
     constexpr std::chrono::seconds s2(5);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
index fac58b9716d3..4bf26e4288b7 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -45,7 +47,7 @@ int main()
     std::chrono::duration<double, std::ratio<1, 15> > r = s1 - s2;
     assert(r.count() == -15);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::seconds s1(3);
     constexpr std::chrono::seconds s2(5);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
index 6b24676f100c..561516b66511 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -41,7 +43,7 @@ int main()
     std::chrono::duration<double, std::ratio<3, 5> > s2(5);
     assert(s1 / s2 == 20./3);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::nanoseconds ns1(15);
     constexpr std::chrono::nanoseconds ns2(5);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
index 3036cde5bf67..8b667e84d4d7 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -26,7 +28,7 @@ int main()
     ns = ns / 5;
     assert(ns.count() == 3);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::nanoseconds ns(15);
     constexpr std::chrono::nanoseconds ns2 = ns / 5;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
index e69f3205d14f..441b053dc521 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -39,7 +41,7 @@ int main()
     std::chrono::duration<int, std::ratio<1, 15> > r = s1 % s2;
     assert(r.count() == 24);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::nanoseconds ns1(15);
     constexpr std::chrono::nanoseconds ns2(6);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
index 1acbe34ea5eb..537fae373930 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -26,7 +28,7 @@ int main()
     ns = ns % 6;
     assert(ns.count() == 3);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::nanoseconds ns(15);
     constexpr std::chrono::nanoseconds ns2 = ns % 6;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
index 190e74b1dc32..6b8c83732127 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
@@ -24,6 +24,8 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -33,7 +35,7 @@ int main()
     ns = 6 * ns;
     assert(ns.count() == 90);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     constexpr std::chrono::nanoseconds ns(3);
     constexpr std::chrono::nanoseconds ns2 = ns * 5;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp
index 405461e88ae9..48c3e86e8101 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp
@@ -17,6 +17,7 @@
 #include <limits>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 template <class D>
@@ -27,7 +28,7 @@ void test()
     Rep max_rep = std::chrono::duration_values<Rep>::max();
     assert(D::max().count() == max_rep);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     typedef typename D::rep Rep;
     constexpr Rep max_rep = std::chrono::duration_values<Rep>::max();
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp
index 44cd64eff3d3..0d94aaa5869c 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp
@@ -17,6 +17,7 @@
 #include <limits>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 template <class D>
@@ -27,7 +28,7 @@ void test()
     Rep min_rep = std::chrono::duration_values<Rep>::min();
     assert(D::min().count() == min_rep);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     typedef typename D::rep Rep;
     constexpr Rep min_rep = std::chrono::duration_values<Rep>::min();
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp
index 18350fe2ff47..7b312c5acb50 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp
@@ -16,6 +16,7 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 template <class D>
@@ -26,7 +27,7 @@ void test()
     Rep zero_rep = std::chrono::duration_values<Rep>::zero();
     assert(D::zero().count() == zero_rep);
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     {
     typedef typename D::rep Rep;
     constexpr Rep zero_rep = std::chrono::duration_values<Rep>::zero();
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
index 89dc1dcc1a59..e3754c1f6475 100644
--- a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
@@ -15,6 +15,7 @@
 #include <limits>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 int main()
@@ -25,7 +26,7 @@ int main()
            std::numeric_limits<double>::max());
     assert(std::chrono::duration_values<Rep>::max() ==
            std::numeric_limits<Rep>::max());
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     static_assert(std::chrono::duration_values<int>::max() ==
            std::numeric_limits<int>::max(), "");
     static_assert(std::chrono::duration_values<double>::max() ==
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
index 69812bba006a..508837375b87 100644
--- a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
@@ -15,6 +15,7 @@
 #include <limits>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 int main()
@@ -25,7 +26,7 @@ int main()
            std::numeric_limits<double>::lowest());
     assert(std::chrono::duration_values<Rep>::min() ==
            std::numeric_limits<Rep>::lowest());
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     static_assert(std::chrono::duration_values<int>::min() ==
            std::numeric_limits<int>::lowest(), "");
     static_assert(std::chrono::duration_values<double>::min() ==
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
index 234b4bc31c9d..b84a676738a8 100644
--- a/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
@@ -14,13 +14,14 @@
 #include <chrono>
 #include <cassert>
 
+#include "test_macros.h"
 #include "../../rep.h"
 
 int main()
 {
     assert(std::chrono::duration_values<int>::zero() == 0);
     assert(std::chrono::duration_values<Rep>::zero() == 0);
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if TEST_STD_VER >= 11
     static_assert(std::chrono::duration_values<int>::zero() == 0, "");
     static_assert(std::chrono::duration_values<Rep>::zero() == 0, "");
 #endif
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
index eeaa8a24ee68..fa2f116f7718 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
@@ -86,7 +86,6 @@ int main()
         static_assert(!noexcept(std::tuple<NoExceptDefault, ThrowingDefault>()), "");
         static_assert(!noexcept(std::tuple<ThrowingDefault, ThrowingDefault>()), "");
     }
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
     {
         constexpr std::tuple<> t;
     }
@@ -106,5 +105,4 @@ int main()
         IllFormedDefault v(0);
         std::tuple<IllFormedDefault> t(v);
     }
-#endif
 }
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
index 90476bcde28c..12968de2dd47 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03
+
 // <utility>
 
 // template <class T1, class T2> struct pair
@@ -42,7 +44,6 @@ public:
 
 int main()
 {
-#ifndef _LIBCPP_HAS_NO_VARIADICS
     std::pair<A, B> p(std::piecewise_construct,
                       std::make_tuple(4, 'a'),
                       std::make_tuple(3.5, 6u, 2u));
@@ -51,5 +52,4 @@ int main()
     assert(p.second.get_d() == 3.5);
     assert(p.second.get_u1() == 6u);
     assert(p.second.get_u2() == 2u);
-#endif
 }
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
index 42a2666dd04b..c738adad7d79 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03
+
 // <utility>
 
 // template <class T1, class T2> struct pair
@@ -21,7 +23,6 @@
 
 int main()
 {
-#ifndef _LIBCPP_HAS_NO_VARIADICS
     {
         typedef std::pair<int, int*> P1;
         typedef std::pair<int*, int> P2;
@@ -31,5 +32,4 @@ int main()
         assert(p3.first == P1(3, nullptr));
         assert(p3.second == P2(nullptr, 4));
     }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
 }