From f4a257a2cf502aea581f76fad6e27cc2e2716f36 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 5 Aug 2017 13:05:00 -0600 Subject: [PATCH] Remove a largely unused iterator typedef. Move further towards the goal of trying to dispatch as small a number of iterators to make the life of IDEs easier. --- include/deal.II/dofs/dof_accessor.templates.h | 16 ++++++---------- include/deal.II/grid/tria_iterator_selector.h | 6 ------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index 77de465c2b..e53f069236 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -783,11 +783,9 @@ namespace internal // a problem Assert ((dim==structdim ? - typename - internal::Triangulation::Iterators:: - raw_cell_iterator (&dof_handler.get_triangulation(), - obj_level, - obj_index)->used() + TriaRawIterator > (&dof_handler.get_triangulation(), + obj_level, + obj_index)->used() : (structdim==1 ? @@ -835,11 +833,9 @@ namespace internal // a problem Assert ((dim==structdim ? - typename - internal::Triangulation::Iterators:: - raw_cell_iterator (&dof_handler.get_triangulation(), - obj_level, - obj_index)->used() + TriaRawIterator > (&dof_handler.get_triangulation(), + obj_level, + obj_index)->used() : (structdim==1 ? diff --git a/include/deal.II/grid/tria_iterator_selector.h b/include/deal.II/grid/tria_iterator_selector.h index 18c1a9342e..307384123e 100644 --- a/include/deal.II/grid/tria_iterator_selector.h +++ b/include/deal.II/grid/tria_iterator_selector.h @@ -80,8 +80,6 @@ namespace internal typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; typedef TriaActiveIterator > active_hex_iterator; - - typedef raw_line_iterator raw_cell_iterator; }; @@ -136,8 +134,6 @@ namespace internal typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; typedef TriaActiveIterator > active_hex_iterator; - - typedef raw_quad_iterator raw_cell_iterator; }; @@ -176,8 +172,6 @@ namespace internal typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; typedef TriaActiveIterator > active_hex_iterator; - - typedef raw_hex_iterator raw_cell_iterator; }; } -- 2.39.5