Work around bug in initialization of std::array base class with older clangs

llvm-svn: 289741

2 files changed, 9 insertions, 3 deletions

diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/derived_from_tuple_like.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/derived_from_tuple_like.pass.cpp
index 82bb8984321..c9496d0b5b0 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/derived_from_tuple_like.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/derived_from_tuple_like.pass.cpp
@@ -95,7 +95,9 @@ void do_derived_assign_test() {
   }
   reset();
   {
-    DerivedFromTup<std::array<int, 2>> d = {{{42, 101}}};
+    DerivedFromTup<std::array<int, 2>> d;
+    d[0] = 42;
+    d[1] = 101;
     t = ValueCategoryCast<VC>(d);
     assert(std::get<0>(t) == 42);
     assert(std::get<1>(t).checkAssign(101, VC));
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp
index 233a3088119..53b1e302923 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/derived_from_tuple_like.pass.cpp
@@ -103,7 +103,9 @@ void do_derived_construct_test() {
     assert(std::get<1>(t).checkConstruct(101, VC));
   }
   {
-    DerivedFromTup<std::array<int, 2>> d = {{{42, 101}}};
+    DerivedFromTup<std::array<int, 2>> d;
+    d[0] = 42;
+    d[1] = 101;
     Tup1 t = ValueCategoryCast<VC>(d);
     assert(std::get<0>(t) == 42);
     assert(std::get<1>(t).checkConstruct(101, VC));
@@ -132,7 +134,9 @@ void do_derived_construct_test() {
     using D = DerivedFromTup<std::array<int, 2>>;
     static_assert(!std::is_convertible<ApplyValueCategoryT<VC, D>, Tup2>::value,
                   "");
-    D d = {{{42, 101}}};
+    D d;
+    d[0] = 42;
+    d[1] = 101;
     Tup2 t(ValueCategoryCast<VC>(d));
     assert(std::get<0>(t) == 42);
     assert(std::get<1>(t).checkConstruct(101, VC));