From 6e753d001359955ccb5db702de2a2b2f06541beb Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 17 Jan 2020 23:03:18 -0600 Subject: [PATCH] Fix tests using DataOut::active_cell_iterator --- tests/data_out/data_out_08.cc | 4 ++-- tests/mpi/p4est_2d_constraintmatrix_04.cc | 8 ++++---- tests/mpi/p4est_3d_constraintmatrix_03.cc | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/data_out/data_out_08.cc b/tests/data_out/data_out_08.cc index 597cbeab3d..d7d0be3ec6 100644 --- a/tests/data_out/data_out_08.cc +++ b/tests/data_out/data_out_08.cc @@ -86,8 +86,8 @@ public: const IteratorFilters::SubdomainEqualTo predicate(subdomain_id); return ++( - FilteredIterator::cell_iterator>(predicate, - old_cell)); + FilteredIterator::active_cell_iterator>( + predicate, old_cell)); } else return old_cell; diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index e708e5cf66..18053718a5 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -67,8 +67,7 @@ public: virtual typename DataOut::cell_iterator first_cell() { - typename DataOut::active_cell_iterator cell = - this->triangulation->begin_active(); + auto cell = this->triangulation->begin_active(); while ((cell != this->triangulation->end()) && (cell->subdomain_id() != subdomain_id)) ++cell; @@ -83,8 +82,9 @@ public: { const IteratorFilters::SubdomainEqualTo predicate(subdomain_id); - return ++(FilteredIterator::active_cell_iterator>( - predicate, old_cell)); + return ++( + FilteredIterator::active_cell_iterator>( + predicate, old_cell)); } else return old_cell; diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index 0e206e2f03..59dff0a4bf 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -67,8 +67,7 @@ public: virtual typename DataOut::cell_iterator first_cell() { - typename DataOut::active_cell_iterator cell = - this->triangulation->begin_active(); + auto cell = this->triangulation->begin_active(); while ((cell != this->triangulation->end()) && (cell->subdomain_id() != subdomain_id)) ++cell; @@ -83,8 +82,9 @@ public: { const IteratorFilters::SubdomainEqualTo predicate(subdomain_id); - return ++(FilteredIterator::active_cell_iterator>( - predicate, old_cell)); + return ++( + FilteredIterator::active_cell_iterator>( + predicate, old_cell)); } else return old_cell; -- 2.39.5