vendor/libc++/libc++-trunk-r290819

1 files changed, 29 insertions, 27 deletions

diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
index e5991df636f8..a802a05da2bc 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
@@ -21,6 +21,8 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main()
 {
     {
@@ -49,104 +51,104 @@ int main()
     }
     {
         typedef std::tuple<int, double> T1;
-        typedef std::tuple<double, char> T2;
+        typedef std::tuple<double, long> T2;
         const T1 t1(1, 2);
-        const T2 t2(1, char(2));
+        const T2 t2(1, 2);
         assert(t1 == t2);
         assert(!(t1 != t2));
     }
     {
         typedef std::tuple<int, double> T1;
-        typedef std::tuple<double, char> T2;
+        typedef std::tuple<double, long> T2;
         const T1 t1(1, 2);
-        const T2 t2(1, char(3));
+        const T2 t2(1, 3);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
         typedef std::tuple<int, double> T1;
-        typedef std::tuple<double, char> T2;
+        typedef std::tuple<double, long> T2;
         const T1 t1(1, 2);
-        const T2 t2(1.1, char(2));
+        const T2 t2(1.1, 2);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
         typedef std::tuple<int, double> T1;
-        typedef std::tuple<double, char> T2;
+        typedef std::tuple<double, long> T2;
         const T1 t1(1, 2);
-        const T2 t2(1.1, char(3));
+        const T2 t2(1.1, 3);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1, 2, 3);
         assert(t1 == t2);
         assert(!(t1 != t2));
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1.1, 2, 3);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1, 3, 3);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1, 2, 4);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1, 3, 2);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1.1, 2, 2);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1.1, 3, 3);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         const T1 t1(1, 2, 3);
         const T2 t2(1.1, 3, 2);
         assert(!(t1 == t2));
         assert(t1 != t2);
     }
-#if _LIBCPP_STD_VER > 11
+#if TEST_STD_VER > 11
     {
-        typedef std::tuple<char, int, double> T1;
-        typedef std::tuple<double, char, int> T2;
+        typedef std::tuple<long, int, double> T1;
+        typedef std::tuple<double, long, int> T2;
         constexpr T1 t1(1, 2, 3);
         constexpr T2 t2(1.1, 3, 2);
         static_assert(!(t1 == t2), "");