From 07aa88f430dfc741f76efdfed51ceef1e1932756 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 8 Oct 2018 06:46:10 +0200 Subject: [PATCH] Simplify aliases in step-16 --- examples/step-16/step-16.cc | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/examples/step-16/step-16.cc b/examples/step-16/step-16.cc index 295793eba9..d9c4ce9c1a 100644 --- a/examples/step-16/step-16.cc +++ b/examples/step-16/step-16.cc @@ -380,13 +380,12 @@ namespace Step16 { MappingQ1 mapping; - using Iterator = decltype(this->dof_handler.begin_active()); - - auto cell_worker = [&](const Iterator & cell, - ScratchData &scratch_data, - CopyData & copy_data) { - this->cell_worker(cell, scratch_data, copy_data); - }; + auto cell_worker = + [&](const typename DoFHandler::active_cell_iterator &cell, + ScratchData & scratch_data, + CopyData & copy_data) { + this->cell_worker(cell, scratch_data, copy_data); + }; auto copier = [&](const CopyData &cd) { this->constraints.distribute_local_to_global(cd.cell_matrix, @@ -449,13 +448,12 @@ namespace Step16 boundary_constraints[level].close(); } - using Iterator = decltype(this->dof_handler.begin_mg()); - - auto cell_worker = [&](const Iterator & cell, - ScratchData &scratch_data, - CopyData & copy_data) { - this->cell_worker(cell, scratch_data, copy_data); - }; + auto cell_worker = + [&](const typename DoFHandler::active_cell_iterator &cell, + ScratchData & scratch_data, + CopyData & copy_data) { + this->cell_worker(cell, scratch_data, copy_data); + }; auto copier = [&](const CopyData &cd) { boundary_constraints[cd.level].distribute_local_to_global( -- 2.39.5