From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 8 Oct 2018 04:46:10 +0000 (+0200)
Subject: Simplify aliases in step-16
X-Git-Tag: v9.1.0-rc1~650^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7298%2Fhead;p=dealii.git

Simplify aliases in step-16
---

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<dim> mapping;
 
-    using Iterator = decltype(this->dof_handler.begin_active());
-
-    auto cell_worker = [&](const Iterator &  cell,
-                           ScratchData<dim> &scratch_data,
-                           CopyData &        copy_data) {
-      this->cell_worker(cell, scratch_data, copy_data);
-    };
+    auto cell_worker =
+      [&](const typename DoFHandler<dim>::active_cell_iterator &cell,
+          ScratchData<dim> &                                    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<dim> &scratch_data,
-                           CopyData &        copy_data) {
-      this->cell_worker(cell, scratch_data, copy_data);
-    };
+    auto cell_worker =
+      [&](const typename DoFHandler<dim>::active_cell_iterator &cell,
+          ScratchData<dim> &                                    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(