From: wolf Date: Mon, 30 Apr 2001 13:08:29 +0000 (+0000) Subject: Add about 150 missing typename keywords. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3f3efd4672431b6b09039ffb63bf52f55c23683;p=dealii-svn.git Add about 150 missing typename keywords. git-svn-id: https://svn.dealii.org/trunk@4509 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index dcc57eb7a4..77545b80e8 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -206,10 +206,10 @@ class FiniteElement : public FiniteElementBase */ virtual void fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const = 0; /** @@ -225,11 +225,11 @@ class FiniteElement : public FiniteElementBase */ virtual void fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const = 0; /** @@ -245,7 +245,7 @@ class FiniteElement : public FiniteElementBase */ virtual void fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index a67b68ae2a..9bad222e31 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -852,7 +852,7 @@ class FiniteElementBase : public Subscriptor, * gradients. */ void compute_2nd (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int offset, typename Mapping::InternalDataBase &mapping_internal, InternalDataBase &fe_internal, diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index 337d2f95f3..a062f01895 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -93,10 +93,10 @@ class FE_DGQ : public FiniteElement */ virtual void fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const; /** @@ -106,11 +106,11 @@ class FE_DGQ : public FiniteElement */ virtual void fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const ; /** @@ -120,12 +120,12 @@ class FE_DGQ : public FiniteElement */ virtual void fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const ; private: diff --git a/deal.II/deal.II/include/fe/fe_q.h b/deal.II/deal.II/include/fe/fe_q.h index 463071a48b..77e4d32027 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -304,10 +304,10 @@ class FE_Q : public FiniteElement */ virtual void fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const; /** @@ -317,11 +317,11 @@ class FE_Q : public FiniteElement */ virtual void fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const ; /** @@ -331,12 +331,12 @@ class FE_Q : public FiniteElement */ virtual void fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_internal, - Mapping::InternalDataBase &fe_internal, + typename Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &fe_internal, FEValuesData& data) const ; private: diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index cbbfdc05d8..814523e3e2 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -593,7 +593,7 @@ class FEValuesBase : protected FEValuesData * to the @p{get_function_*} functions * safer. */ - DoFHandler::cell_iterator present_cell; + typename DoFHandler::cell_iterator present_cell; /** * Storage for the mapping object. diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 4d26b53b69..ad88528974 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -60,9 +60,9 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - fill_fe_values (const DoFHandler::cell_iterator &cell, + fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature& quadrature, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values) const ; diff --git a/deal.II/deal.II/include/fe/mapping_q.h b/deal.II/deal.II/include/fe/mapping_q.h index 8e2d3c8602..ef8cc90ed1 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -121,9 +121,9 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - fill_fe_values (const DoFHandler::cell_iterator &cell, + fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values) const ; @@ -132,10 +132,10 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - fill_fe_face_values (const DoFHandler::cell_iterator &cell, + fill_fe_face_values (const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Quadrature& quadrature, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values, std::vector > &exterior_form, @@ -403,7 +403,7 @@ class MappingQ : public MappingQ1 * @p{compute_support_points_simple} */ //TODO:[RH] (later) remove this function altogether? - void fill_quad_support_points_simple (const Triangulation::cell_iterator &cell, + void fill_quad_support_points_simple (const typename Triangulation::cell_iterator &cell, std::vector > &a) const; /** diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index 7d15d8310a..38b1ddbcb7 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -121,9 +121,9 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - fill_fe_values (const DoFHandler::cell_iterator &cell, + fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature& quadrature, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values) const ; diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 7385e2a39a..8874e31296 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -79,9 +79,9 @@ Multigrid::copy_to_mg (const Vector& osrc) // already have built. for (int level=maxlevel; level>=static_cast(minlevel); --level) { - MGDoFHandler::active_cell_iterator + typename MGDoFHandler::active_cell_iterator level_cell = mg_dof_handler->begin_active(level); - const MGDoFHandler::active_cell_iterator + const typename MGDoFHandler::active_cell_iterator level_end = mg_dof_handler->end_active(level); //TODO:[?] Treat hanging nodes properly @@ -108,7 +108,8 @@ Multigrid::copy_to_mg (const Vector& osrc) for (unsigned int face_n=0; face_n::faces_per_cell; ++face_n) { - const MGDoFHandler::face_iterator face = level_cell->face(face_n); + const typename MGDoFHandler::face_iterator + face = level_cell->face(face_n); if (face->has_children()) { face->get_mg_dof_indices(level_face_indices); @@ -147,9 +148,9 @@ Multigrid::copy_from_mg(Vector &dst) const std::vector global_dof_indices (dofs_per_cell); std::vector level_dof_indices (dofs_per_cell); - MGDoFHandler::active_cell_iterator + typename MGDoFHandler::active_cell_iterator level_cell = mg_dof_handler->begin_active(); - const MGDoFHandler::active_cell_iterator + const typename MGDoFHandler::active_cell_iterator endc = mg_dof_handler->end(); // traverse all cells and copy the @@ -202,11 +203,11 @@ Multigrid::print_vector (const unsigned int level, std::vector global_dof_indices (dofs_per_cell); std::vector level_dof_indices (dofs_per_cell); - DoFHandler::active_cell_iterator + typename DoFHandler::active_cell_iterator global_cell = dof->begin_active(level); - MGDoFHandler::active_cell_iterator + typename MGDoFHandler::active_cell_iterator level_cell = mg_dof_handler->begin_active(level); - const MGDoFHandler::cell_iterator + const typename MGDoFHandler::cell_iterator endc = mg_dof_handler->end(level); // traverse all cells and copy the diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 14ccdeacf8..c6e3a3f77d 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -54,8 +54,8 @@ DoFTools::make_sparsity_pattern (const DoFHandler &dof, const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(dofs_per_cell); - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); for (; cell!=endc; ++cell) { cell->get_dof_indices (dofs_on_this_cell); @@ -100,8 +100,8 @@ DoFTools::make_sparsity_pattern (const DoFHandler &dof, std::vector dofs_on_this_cell(dofs_per_cell); - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); for (; cell!=endc; ++cell) { cell->get_dof_indices (dofs_on_this_cell); @@ -301,8 +301,8 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, const unsigned int total_dofs = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(total_dofs); std::vector dofs_on_other_cell(total_dofs); - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); // clear user flags for further use const_cast&>(dof.get_tria()).clear_user_flags(); @@ -321,13 +321,14 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, face < GeometryInfo::faces_per_cell; ++face) { - DoFHandler::face_iterator cell_face = cell->face(face); + typename DoFHandler::face_iterator cell_face = cell->face(face); if (cell_face->user_flag_set ()) continue; if (! cell->at_boundary (face) ) { - DoFHandler::cell_iterator neighbor = cell->neighbor(face); + typename DoFHandler::cell_iterator + neighbor = cell->neighbor(face); // Refinement edges are taken care of // by coarser cells if (neighbor->level() < cell->level()) @@ -341,7 +342,7 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, sub_nr != GeometryInfo::subfaces_per_face; ++sub_nr) { - DoFHandler::cell_iterator sub_neighbor + typename DoFHandler::cell_iterator sub_neighbor = neighbor-> child(GeometryInfo::child_cell_on_face(neighbor_face, sub_nr)); @@ -405,8 +406,8 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, const unsigned int total_dofs = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(total_dofs); std::vector dofs_on_other_cell(total_dofs); - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); std::vector > int_dof_mask(total_dofs, @@ -442,13 +443,14 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, face < GeometryInfo::faces_per_cell; ++face) { - DoFHandler::face_iterator cell_face = cell->face(face); + typename DoFHandler::face_iterator cell_face = cell->face(face); if (cell_face->user_flag_set ()) continue; if (! cell->at_boundary (face) ) { - DoFHandler::cell_iterator neighbor = cell->neighbor(face); + typename DoFHandler::cell_iterator + neighbor = cell->neighbor(face); // Refinement edges are taken care of // by coarser cells if (neighbor->level() < cell->level()) @@ -462,7 +464,7 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, sub_nr != GeometryInfo::subfaces_per_face; ++sub_nr) { - DoFHandler::cell_iterator sub_neighbor + typename DoFHandler::cell_iterator sub_neighbor = neighbor-> child(GeometryInfo::child_cell_on_face(neighbor_face, sub_nr)); @@ -771,8 +773,9 @@ void DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler // in the sum for each dof std::vector touch_count (dof_handler.n_dofs(), 0); - DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), - endc = dof_handler.end(); + typename DoFHandler::active_cell_iterator + cell = dof_handler.begin_active(), + endc = dof_handler.end(); unsigned int present_cell = 0; const unsigned int dofs_per_cell = fe.dofs_per_cell; std::vector dof_indices (dofs_per_cell); @@ -831,7 +834,7 @@ DoFTools::extract_dofs (const DoFHandler &dof, std::vector indices(fe.dofs_per_cell); - DoFHandler::active_cell_iterator c; + typename DoFHandler::active_cell_iterator c; for (c = dof.begin_active() ; c != dof.end() ; ++ c) { c->get_dof_indices(indices); @@ -864,7 +867,7 @@ DoFTools::extract_level_dofs(const unsigned int level, std::vector indices(fe.dofs_per_cell); - MGDoFHandler::cell_iterator c; + typename MGDoFHandler::cell_iterator c; for (c = dof.begin(level) ; c != dof.end(level) ; ++ c) { c->get_mg_dof_indices(indices); @@ -919,7 +922,8 @@ DoFTools::extract_boundary_dofs (const DoFHandler &dof_handler, // line is also part of a boundary // face which we will be visiting // sooner or later - for (DoFHandler::active_cell_iterator cell=dof_handler.begin_active(); + for (typename DoFHandler::active_cell_iterator + cell=dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->at_boundary(face)) @@ -1282,7 +1286,8 @@ DoFTools::compute_intergrid_constraints (const DoFHandler &coa std::vector dof_is_interesting (fine_grid.n_dofs(), false); std::vector local_dof_indices (fine_fe.dofs_per_cell); - for (DoFHandler::active_cell_iterator cell=fine_grid.begin_active(); + for (typename DoFHandler::active_cell_iterator + cell=fine_grid.begin_active(); cell!=fine_grid.end(); ++cell) { cell->get_dof_indices (local_dof_indices); diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index de305f61c8..0b2fda4871 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -296,9 +296,9 @@ template void FiniteElementBase:: compute_2nd (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int offset, - Mapping::InternalDataBase &mapping_internal, + typename Mapping::InternalDataBase &mapping_internal, InternalDataBase &fe_internal, FEValuesData &data) const { diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 62362176fa..8e7fc91c01 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -426,10 +426,10 @@ FE_DGQ::get_data (const UpdateFlags update_flags, template void FE_DGQ::fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal @@ -463,11 +463,11 @@ FE_DGQ::fill_fe_values (const Mapping &mapping, template void FE_DGQ::fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal @@ -506,12 +506,12 @@ FE_DGQ::fill_fe_face_values (const Mapping &mapping, template void FE_DGQ::fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face, const unsigned int subface, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 7fcf0b9d6f..51eff18833 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -1024,10 +1024,10 @@ FE_Q::get_data (const UpdateFlags update_flags, template void FE_Q::fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal @@ -1061,11 +1061,11 @@ FE_Q::fill_fe_values (const Mapping &mapping, template void FE_Q::fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal @@ -1104,12 +1104,12 @@ FE_Q::fill_fe_face_values (const Mapping &mapping, template void FE_Q::fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face, const unsigned int subface, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 8febc2ce28..7f241821ad 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -358,10 +358,10 @@ FESystem::get_data (UpdateFlags flags, template void FESystem::fill_fe_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fe_data, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { compute_fill(mapping, cell, invalid_face_number, invalid_face_number, @@ -373,11 +373,11 @@ FESystem::fill_fe_values (const Mapping &mapping, template void FESystem::fill_fe_face_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fe_data, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { compute_fill(mapping, cell, face_no, invalid_face_number, @@ -390,12 +390,12 @@ FESystem::fill_fe_face_values (const Mapping &mappin template void FESystem::fill_fe_subface_values (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fe_data, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { compute_fill(mapping, cell, face_no, sub_no, @@ -408,12 +408,12 @@ template template void FESystem::compute_fill (const Mapping &mapping, - const DoFHandler::cell_iterator &cell, + const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - Mapping::InternalDataBase &mapping_data, - Mapping::InternalDataBase &fedata, + typename Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index ceda68baf7..2c6ba570f3 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -161,10 +161,10 @@ void FETools::interpolate(const DoFHandler &dof1, FETools::get_interpolation_matrix(dof1.get_fe(), dof2.get_fe(), interpolation_matrix); - DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), - endc1 = dof1.end(), - cell2 = dof2.begin_active(), - endc2 = dof2.end(); + typename DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), + endc1 = dof1.end(), + cell2 = dof2.begin_active(), + endc2 = dof2.end(); std::vector index_multiplicity(dof2.n_dofs(),0); std::vector dofs (dofs_per_cell2); @@ -211,8 +211,8 @@ void FETools::back_interpolate(const DoFHandler &dof1, FETools::get_back_interpolation_matrix(dof1.get_fe(), fe2, interpolation_matrix); - DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), - endc1 = dof1.end(); + typename DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), + endc1 = dof1.end(); for (; cell1!=endc1; ++cell1) { @@ -245,8 +245,8 @@ void FETools::interpolation_difference(const DoFHandler &dof1, FETools::get_interpolation_difference_matrix(dof1.get_fe(), fe2, difference_matrix); - DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), - endc1 = dof1.end(); + typename DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), + endc1 = dof1.end(); for (; cell1!=endc1; ++cell1) { diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index e30e77c75a..f6b1662c45 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -244,11 +244,11 @@ MappingCartesian::compute_fill (const typename DoFHandler::cell_iterat template void -MappingCartesian::fill_fe_values (const DoFHandler::cell_iterator& cell, - const Quadrature& q, - Mapping::InternalDataBase& mapping_data, - std::vector >& quadrature_points, - std::vector& JxW_values) const +MappingCartesian::fill_fe_values (const typename DoFHandler::cell_iterator& cell, + const Quadrature& q, + typename Mapping::InternalDataBase& mapping_data, + std::vector >& quadrature_points, + std::vector& JxW_values) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index e2f009f245..dd63000fd8 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -238,9 +238,9 @@ MappingQ::get_subface_data (const UpdateFlags update_flags, template void -MappingQ::fill_fe_values (const DoFHandler::cell_iterator &cell, +MappingQ::fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &q, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values) const { @@ -861,7 +861,7 @@ MappingQ<1>::add_line_support_points (const Triangulation<1>::cell_iterator &, template void -MappingQ::add_line_support_points (const Triangulation::cell_iterator &cell, +MappingQ::add_line_support_points (const typename Triangulation::cell_iterator &cell, std::vector > &a) const { static const StraightBoundary straight_boundary; @@ -1090,7 +1090,7 @@ MappingQ<3>::fill_quad_support_points_simple (const Triangulation<3>::cell_itera template void -MappingQ::fill_quad_support_points_simple (const Triangulation::cell_iterator &, +MappingQ::fill_quad_support_points_simple (const typename Triangulation::cell_iterator &, std::vector > &) const {} diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index a5c06d38a7..821fd03927 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -552,9 +552,9 @@ MappingQ1::compute_mapping_support_points( template void -MappingQ1::fill_fe_values (const DoFHandler::cell_iterator &cell, +MappingQ1::fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &q, - Mapping::InternalDataBase &mapping_data, + typename Mapping::InternalDataBase &mapping_data, std::vector > &quadrature_points, std::vector &JxW_values) const { diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 78fc311943..88fb0757c4 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -554,8 +554,9 @@ void GridOut::write_eps (const Triangulation &tria, case 2: { - Triangulation::active_line_iterator line =tria.begin_active_line (); - Triangulation::active_line_iterator endline=tria.end_line (); + typename Triangulation::active_line_iterator + line =tria.begin_active_line (), + endline=tria.end_line (); // first treat all interior // lines and make up a list @@ -660,8 +661,9 @@ void GridOut::write_eps (const Triangulation &tria, //TODO:[RH] curved boundaries in eps for 3d Assert (mapping == 0, ExcNotImplemented()); - Triangulation::active_line_iterator line =tria.begin_active_line (); - Triangulation::active_line_iterator endline=tria.end_line (); + typename Triangulation::active_line_iterator + line =tria.begin_active_line (), + endline=tria.end_line (); // loop over all lines and compute their // projection on the plane perpendicular diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index 9b401846bd..06668ad00f 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -91,7 +91,7 @@ void GridRefinement::refine (Triangulation &tria, if (threshold==0) return; - Triangulation::active_cell_iterator cell = tria.begin_active(); + typename Triangulation::active_cell_iterator cell = tria.begin_active(); const unsigned int n_cells = criteria.size(); for (unsigned int index=0; index &tria, Assert (*std::min_element(criteria.begin(), criteria.end()) >= 0, ExcInvalidParameterValue()); - Triangulation::active_cell_iterator cell = tria.begin_active(); + typename Triangulation::active_cell_iterator cell = tria.begin_active(); const unsigned int n_cells = criteria.size(); for (unsigned int index=0; index::get_intermediate_points_on_quad ( template void HyperBallBoundary::get_intermediate_points_on_quad ( - const Triangulation::quad_iterator &, + const typename Triangulation::quad_iterator &, typename std::vector > &) const { Assert(false, Boundary::ExcFunctionNotUseful(dim)); @@ -258,7 +258,7 @@ get_normals_at_vertices (const Triangulation<1>::face_iterator &, template void HyperBallBoundary:: -get_normals_at_vertices (const Triangulation::face_iterator &face, +get_normals_at_vertices (const typename Triangulation::face_iterator &face, typename Boundary::FaceVertexNormals &face_vertex_normals) const { for (unsigned int vertex=0; vertex::vertices_per_face; ++vertex) diff --git a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc index b59f07bf57..671bb3fb30 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc @@ -35,8 +35,8 @@ void MGDoFTools::make_sparsity_pattern (const MGDoFHandler &dof, const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(dofs_per_cell); - MGDoFHandler::cell_iterator cell = dof.begin(level), - endc = dof.end(level); + typename MGDoFHandler::cell_iterator cell = dof.begin(level), + endc = dof.end(level); for (; cell!=endc; ++cell) { cell->get_mg_dof_indices (dofs_on_this_cell); @@ -66,8 +66,8 @@ MGDoFTools::make_flux_sparsity_pattern (const MGDoFHandler &dof, const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(dofs_per_cell); std::vector dofs_on_other_cell(dofs_per_cell); - MGDoFHandler::cell_iterator cell = dof.begin(level), - endc = dof.end(level); + typename MGDoFHandler::cell_iterator cell = dof.begin(level), + endc = dof.end(level); for (; cell!=endc; ++cell) { cell->get_mg_dof_indices (dofs_on_this_cell); @@ -85,7 +85,8 @@ MGDoFTools::make_flux_sparsity_pattern (const MGDoFHandler &dof, if ( (! cell->at_boundary(face)) && (static_cast(cell->neighbor_level(face)) == level) ) { - MGDoFHandler::cell_iterator neighbor = cell->neighbor(face); + typename MGDoFHandler::cell_iterator + neighbor = cell->neighbor(face); neighbor->get_mg_dof_indices (dofs_on_other_cell); // only add one direction // The other is taken care of @@ -127,8 +128,8 @@ MGDoFTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &dof, const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(dofs_per_cell); std::vector dofs_on_other_cell(dofs_per_cell); - MGDoFHandler::cell_iterator cell = dof.begin(level), - endc = dof.end(level); + typename MGDoFHandler::cell_iterator cell = dof.begin(level), + endc = dof.end(level); for (; cell!=endc; ++cell) { cell->get_mg_dof_indices (dofs_on_this_cell); @@ -142,7 +143,8 @@ MGDoFTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &dof, if ( (! cell->at_boundary(face)) && (static_cast(cell->neighbor_level(face)) != level) ) { - MGDoFHandler::cell_iterator neighbor = cell->neighbor(face); + typename MGDoFHandler::cell_iterator + neighbor = cell->neighbor(face); neighbor->get_mg_dof_indices (dofs_on_other_cell); for (unsigned int i=0; i &dof, const unsigned int total_dofs = dof.get_fe().dofs_per_cell; std::vector dofs_on_this_cell(total_dofs); std::vector dofs_on_other_cell(total_dofs); - MGDoFHandler::cell_iterator cell = dof.begin(level), - endc = dof.end(level); + typename MGDoFHandler::cell_iterator cell = dof.begin(level), + endc = dof.end(level); std::vector > int_dof_mask(total_dofs, @@ -226,13 +228,14 @@ MGDoFTools::make_flux_sparsity_pattern (const MGDoFHandler &dof, face < GeometryInfo::faces_per_cell; ++face) { - MGDoFHandler::face_iterator cell_face = cell->face(face); + typename MGDoFHandler::face_iterator cell_face = cell->face(face); if (cell_face->user_flag_set ()) continue; if (! cell->at_boundary (face) ) { - MGDoFHandler::cell_iterator neighbor = cell->neighbor(face); + typename MGDoFHandler::cell_iterator + neighbor = cell->neighbor(face); if (neighbor->level() < cell->level()) continue; diff --git a/deal.II/deal.II/source/multigrid/mg_smoother.cc b/deal.II/deal.II/source/multigrid/mg_smoother.cc index ce12e5069a..ed80acf359 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -88,7 +88,7 @@ MGSmoother::MGSmoother (const MGDoFHandler &mg_dof, unsigned int steps) // at the boundary of this level's // cells and if so add the dofs // to the interior boundary dofs - for (MGDoFHandler::cell_iterator cell=mg_dof.begin(level); + for (typename MGDoFHandler::cell_iterator cell=mg_dof.begin(level); cell != mg_dof.end(level); ++cell) for (unsigned int face=0; face::faces_per_cell; ++face) if ((cell->neighbor(face).state() == valid) && diff --git a/deal.II/deal.II/source/multigrid/multigrid.cc b/deal.II/deal.II/source/multigrid/multigrid.cc index 6ad73f4abc..6861fcd100 100644 --- a/deal.II/deal.II/source/multigrid/multigrid.cc +++ b/deal.II/deal.II/source/multigrid/multigrid.cc @@ -135,8 +135,8 @@ void MGTransferPrebuilt::build_matrices (const MGDoFHandler &mg_dof) prolongation_matrices.push_back (SparseMatrix()); prolongation_matrices[level].reinit (prolongation_sparsities[level]); -// now actually build the matrices - for (MGDoFHandler::cell_iterator cell=mg_dof.begin(level); + // now actually build the matrices + for (typename MGDoFHandler::cell_iterator cell=mg_dof.begin(level); cell != mg_dof.end(level); ++cell) if (cell->has_children()) { diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 6593b8c135..b2d889fbba 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -316,7 +316,7 @@ void DataOut::build_some_patches (Data data) unsigned int cell_number = 0; typename std::vector >::iterator patch = patches.begin(); - DoFHandler::cell_iterator cell=first_cell(); + typename DoFHandler::cell_iterator cell=first_cell(); // get first cell in this thread for (unsigned int i=0; (iend()); ++i) @@ -427,7 +427,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // create patches of and make sure // there is enough memory for that unsigned int n_patches = 0; - for (DoFHandler::cell_iterator cell=first_cell(); + for (typename DoFHandler::cell_iterator cell=first_cell(); cell != dofs->end(); cell = next_cell(cell)) ++n_patches; diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index 39081edcbd..7d14c47f56 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -347,7 +347,7 @@ void DataOutRotation::build_patches (const unsigned int n_patches_per_circl // create patches of and make sure // there is enough memory for that unsigned int n_patches = 0; - for (DoFHandler::cell_iterator cell=first_cell(); + for (typename DoFHandler::cell_iterator cell=first_cell(); cell != dofs->end(); cell = next_cell(cell)) ++n_patches; diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index 62de438914..7cc13423a3 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -207,7 +207,8 @@ void DataOutStack::build_patches (const unsigned int n_subdivisions) // create patches of and make sure // there is enough memory for that unsigned int n_patches = 0; - for (DoFHandler::active_cell_iterator cell=dof_handler->begin_active(); + for (typename DoFHandler::active_cell_iterator + cell=dof_handler->begin_active(); cell != dof_handler->end(); ++cell) ++n_patches; diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index 7e217776bb..61d76434df 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -73,8 +73,8 @@ void SolutionTransfer::prepare_for_pure_refinement() indices_on_cell=std::vector > (n_active_cells, std::vector (dofs_per_cell)); - DoFHandler::cell_iterator cell = dof_handler->begin(), - endc = dof_handler->end(); + typename DoFHandler::cell_iterator cell = dof_handler->begin(), + endc = dof_handler->end(); for (unsigned int i=0; cell!=endc; ++cell) { @@ -112,8 +112,8 @@ SolutionTransfer::refine_interpolate(const Vector &in, unsigned int dofs_per_cell=dof_handler->get_fe().dofs_per_cell; Vector local_values(dofs_per_cell); - DoFHandler::cell_iterator cell = dof_handler->begin(), - endc = dof_handler->end(); + typename DoFHandler::cell_iterator cell = dof_handler->begin(), + endc = dof_handler->end(); std::vector *indexptr; @@ -177,8 +177,9 @@ prepare_for_coarsening_and_refinement(const typename std::vector // and that'll stay or be refined unsigned int n_cells_to_coarsen=0; unsigned int n_cells_to_stay_or_refine=0; - DoFHandler::active_cell_iterator act_cell = dof_handler->begin_active(), - endc = dof_handler->end(); + typename DoFHandler::active_cell_iterator + act_cell = dof_handler->begin_active(), + endc = dof_handler->end(); for (; act_cell!=endc; ++act_cell) { if (act_cell->coarsen_flag_set()) @@ -214,7 +215,7 @@ prepare_for_coarsening_and_refinement(const typename std::vector // and all the cells where a // @p{Pointerstruct} is needed 'n' unsigned int n_sr=0, n_cf=0, n=0; - DoFHandler::cell_iterator cell = dof_handler->begin(); + typename DoFHandler::cell_iterator cell = dof_handler->begin(); for (; cell!=endc; ++cell) { if (cell->active() && !cell->coarsen_flag_set()) @@ -306,8 +307,8 @@ interpolate (const typename std::vector > &all_in, std::vector > *valuesptr; std::vector dofs(dofs_per_cell); - DoFHandler::cell_iterator cell = dof_handler->begin(), - endc = dof_handler->end(); + typename DoFHandler::cell_iterator cell = dof_handler->begin(), + endc = dof_handler->end(); for (; cell!=endc; ++cell) { diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index 9b984df7d5..738acdbec6 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -525,7 +525,7 @@ void TimeStepBase_Tria::restore_grid () // desired so // if (flags.max_refinement_level != 0) // { -// Triangulation::active_cell_iterator cell, endc; +// typename Triangulation::active_cell_iterator cell, endc; // for (cell = tria->begin_active(), // endc = tria->end(); // cell!=endc; ++cell) @@ -698,11 +698,11 @@ adapt_grids (Triangulation &tria1, { bool grids_changed = false; - Triangulation::cell_iterator cell1 = tria1.begin(), - cell2 = tria2.begin(); - Triangulation::cell_iterator endc; + typename Triangulation::cell_iterator cell1 = tria1.begin(), + cell2 = tria2.begin(); + typename Triangulation::cell_iterator endc; endc = (tria1.n_levels() == 1 ? - Triangulation::cell_iterator(tria1.end()) : + typename Triangulation::cell_iterator(tria1.end()) : tria1.begin(1)); for (; cell1!=endc; ++cell1, ++cell2) grids_changed |= adapt_grids (cell1, cell2); @@ -853,7 +853,7 @@ void TimeStepBase_Tria::refine_grid (const RefinementData refinement_data) // cells, we have to subtract 3/4 of // a cell for each flagged cell double previous_cells = previous_tria->n_active_cells(); - Triangulation::active_cell_iterator cell, endc; + typename Triangulation::active_cell_iterator cell, endc; cell = previous_tria->begin_active(); endc = previous_tria->end(); for (; cell!=endc; ++cell) @@ -1087,7 +1087,7 @@ void TimeStepBase_Tria::refine_grid (const RefinementData refinement_data) { adapt_grids (*previous_tria, *tria); - Triangulation::cell_iterator old_cell, new_cell, endc; + typename Triangulation::cell_iterator old_cell, new_cell, endc; old_cell = previous_tria->begin(0); new_cell = tria->begin(0); endc = tria->end(0); diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 2fc2165f46..43494b7ab2 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -73,8 +73,8 @@ void VectorTools::interpolate (const Mapping &mapping, const unsigned int n_components = fe.n_components(); const bool fe_is_system = (n_components != 1); - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); // For FESystems many of the // unit_support_points will @@ -249,9 +249,9 @@ VectorTools::interpolate (const DoFHandler &dof_1, std::vector touch_count (dof_2.n_dofs(), 0); std::vector local_dof_indices (dof_2.get_fe().dofs_per_cell); - DoFHandler::active_cell_iterator h = dof_1.begin_active(); - DoFHandler::active_cell_iterator l = dof_2.begin_active(); - const DoFHandler::cell_iterator endh = dof_1.end(); + typename DoFHandler::active_cell_iterator h = dof_1.begin_active(); + typename DoFHandler::active_cell_iterator l = dof_2.begin_active(); + const typename DoFHandler::cell_iterator endh = dof_1.end(); for(; h != endh; ++h, ++l) { @@ -986,8 +986,8 @@ VectorTools::integrate_difference (const Mapping &mapping, std::vector > tmp_gradients (fe_values.n_quadrature_points); // loop over all cells - DoFHandler::active_cell_iterator cell = dof.begin_active(), - endc = dof.end(); + typename DoFHandler::active_cell_iterator cell = dof.begin_active(), + endc = dof.end(); for (unsigned int index=0; cell != endc; ++cell, ++index) { double diff=0;