From 695f9e22bf5a06802e4af39d413c5a49bf96fd1b Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 22 Jul 2021 14:37:25 -0600
Subject: [PATCH] Try a different syntax.

---
 tests/data_out/pvtu_physical_units_02.cc | 14 ++++++++------
 tests/data_out/vtu_physical_units_02.cc  | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tests/data_out/pvtu_physical_units_02.cc b/tests/data_out/pvtu_physical_units_02.cc
index f2cf11bc84..ca6317bec3 100644
--- a/tests/data_out/pvtu_physical_units_02.cc
+++ b/tests/data_out/pvtu_physical_units_02.cc
@@ -43,15 +43,17 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   for (unsigned int i = 1; i < 1 + dim; ++i)
     names[i] = "v";
 
-  std::vector<
+  using Descriptor =
     std::tuple<unsigned int,
                unsigned int,
                std::string,
-               DataComponentInterpretation::DataComponentInterpretation>>
-    vectors{{1,
-             1 + dim - 1,
-             "v",
-             DataComponentInterpretation::component_is_part_of_vector}};
+               DataComponentInterpretation::DataComponentInterpretation>;
+  std::vector<Descriptor> vectors(
+    1,
+    Descriptor{1,
+               1 + dim - 1,
+               "v",
+               DataComponentInterpretation::component_is_part_of_vector});
   DataOutBase::write_pvtu_record(out, {"abc.vtu"}, names, vectors, flags);
 }
 
diff --git a/tests/data_out/vtu_physical_units_02.cc b/tests/data_out/vtu_physical_units_02.cc
index 93a3676eb9..d9c2350a1d 100644
--- a/tests/data_out/vtu_physical_units_02.cc
+++ b/tests/data_out/vtu_physical_units_02.cc
@@ -48,15 +48,17 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   for (unsigned int i = 1; i < 1 + dim; ++i)
     names[i] = "v";
 
-  std::vector<
+  using Descriptor =
     std::tuple<unsigned int,
                unsigned int,
                std::string,
-               DataComponentInterpretation::DataComponentInterpretation>>
-    vectors{{1,
-             1 + dim - 1,
-             "v",
-             DataComponentInterpretation::component_is_part_of_vector}};
+               DataComponentInterpretation::DataComponentInterpretation>;
+  std::vector<Descriptor> vectors(
+    1,
+    Descriptor{1,
+               1 + dim - 1,
+               "v",
+               DataComponentInterpretation::component_is_part_of_vector});
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 
-- 
2.39.5