From 7805fbcf73853bc05b99c27a31e6d6ee5c3b2ea2 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 27 Aug 2015 18:27:36 -0500 Subject: [PATCH] Testsuite: Avoid c++11isms --- tests/deal.II/grid_tools_halo_layer_03.cc | 5 ++++- tests/deal.II/grid_tools_halo_layer_05.cc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/deal.II/grid_tools_halo_layer_03.cc b/tests/deal.II/grid_tools_halo_layer_03.cc index 325efbc96b..ae0f5235cf 100644 --- a/tests/deal.II/grid_tools_halo_layer_03.cc +++ b/tests/deal.II/grid_tools_halo_layer_03.cc @@ -88,8 +88,11 @@ void test () } // Compute a halo layer around material ids 2 and 3 and set it to material id 4 + std::set material_ids; + material_ids.insert(2); + material_ids.insert(3); const std::vector active_halo_layer - = GridTools::compute_active_cell_halo_layer(tria, IteratorFilters::MaterialIdEqualTo({2,3}, true)); + = GridTools::compute_active_cell_halo_layer(tria, IteratorFilters::MaterialIdEqualTo(material_ids, true)); AssertThrow(active_halo_layer.size() > 0, ExcMessage("No halo layer found.")); for (typename std::vector::const_iterator it = active_halo_layer.begin(); diff --git a/tests/deal.II/grid_tools_halo_layer_05.cc b/tests/deal.II/grid_tools_halo_layer_05.cc index ff35b09ae0..6707b20160 100644 --- a/tests/deal.II/grid_tools_halo_layer_05.cc +++ b/tests/deal.II/grid_tools_halo_layer_05.cc @@ -120,8 +120,11 @@ void test () } // Compute a halo layer around active fe indices 2,3 and set it to active fe index 4 + std::set material_ids; + material_ids.insert(2); + material_ids.insert(3); std::vector active_halo_layer - = GridTools::compute_active_cell_halo_layer(dof_handler, IteratorFilters::ActiveFEIndexEqualTo({2,3}, true)); + = GridTools::compute_active_cell_halo_layer(dof_handler, IteratorFilters::ActiveFEIndexEqualTo(material_ids, true)); AssertThrow(active_halo_layer.size() > 0, ExcMessage("No halo layer found.")); for (typename std::vector::iterator it = active_halo_layer.begin(); -- 2.39.5