]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add about 150 missing typename keywords.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 30 Apr 2001 13:08:29 +0000 (13:08 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 30 Apr 2001 13:08:29 +0000 (13:08 +0000)
git-svn-id: https://svn.dealii.org/trunk@4509 0785d39b-7218-0410-832d-ea1e28bc413d

30 files changed:
deal.II/deal.II/include/fe/fe.h
deal.II/deal.II/include/fe/fe_base.h
deal.II/deal.II/include/fe/fe_dgq.h
deal.II/deal.II/include/fe/fe_q.h
deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/include/fe/mapping_cartesian.h
deal.II/deal.II/include/fe/mapping_q.h
deal.II/deal.II/include/fe/mapping_q1.h
deal.II/deal.II/include/multigrid/multigrid.templates.h
deal.II/deal.II/source/dofs/dof_tools.cc
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_dgq.cc
deal.II/deal.II/source/fe/fe_q.cc
deal.II/deal.II/source/fe/fe_system.cc
deal.II/deal.II/source/fe/fe_tools.cc
deal.II/deal.II/source/fe/mapping_cartesian.cc
deal.II/deal.II/source/fe/mapping_q.cc
deal.II/deal.II/source/fe/mapping_q1.cc
deal.II/deal.II/source/grid/grid_out.cc
deal.II/deal.II/source/grid/grid_refinement.cc
deal.II/deal.II/source/grid/tria_boundary_lib.cc
deal.II/deal.II/source/multigrid/mg_dof_tools.cc
deal.II/deal.II/source/multigrid/mg_smoother.cc
deal.II/deal.II/source/multigrid/multigrid.cc
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_rotation.cc
deal.II/deal.II/source/numerics/data_out_stack.cc
deal.II/deal.II/source/numerics/solution_transfer.cc
deal.II/deal.II/source/numerics/time_dependent.cc
deal.II/deal.II/source/numerics/vectors.cc

index dcc57eb7a444ced530037d6aafad41a0225aad00..77545b80e8ab4e732b21e0eab46f7082c4bb328d 100644 (file)
@@ -206,10 +206,10 @@ class FiniteElement : public FiniteElementBase<dim>
                                      */                                      
     virtual void
     fill_fe_values (const Mapping<dim>                   &mapping,
-                   const DoFHandler<dim>::cell_iterator &cell,
+                   const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                &quadrature,
-                   Mapping<dim>::InternalDataBase       &mapping_internal,
-                   Mapping<dim>::InternalDataBase       &fe_internal,
+                   typename Mapping<dim>::InternalDataBase       &mapping_internal,
+                   typename Mapping<dim>::InternalDataBase       &fe_internal,
                    FEValuesData<dim>                    &data) const = 0;
     
                                     /**
@@ -225,11 +225,11 @@ class FiniteElement : public FiniteElementBase<dim>
                                      */                                      
     virtual void
     fill_fe_face_values (const Mapping<dim>                   &mapping,
-                        const DoFHandler<dim>::cell_iterator &cell,
+                        const typename DoFHandler<dim>::cell_iterator &cell,
                         const unsigned int                    face_no,
                         const Quadrature<dim-1>              &quadrature,
-                        Mapping<dim>::InternalDataBase       &mapping_internal,
-                        Mapping<dim>::InternalDataBase       &fe_internal,
+                        typename Mapping<dim>::InternalDataBase       &mapping_internal,
+                        typename Mapping<dim>::InternalDataBase       &fe_internal,
                         FEValuesData<dim>                    &data) const = 0;
     
                                     /**
@@ -245,7 +245,7 @@ class FiniteElement : public FiniteElementBase<dim>
                                      */                                      
     virtual void
     fill_fe_subface_values (const Mapping<dim>                   &mapping,
-                           const DoFHandler<dim>::cell_iterator &cell,
+                           const typename DoFHandler<dim>::cell_iterator &cell,
                            const unsigned int                    face_no,
                            const unsigned int                    sub_no,
                            const Quadrature<dim-1>              &quadrature,
index a67b68ae2a11adb023e28043686de0c2eba51637..9bad222e319a508485c570577036db66053a97a5 100644 (file)
@@ -852,7 +852,7 @@ class FiniteElementBase : public Subscriptor,
                                      * gradients.
                                      */
     void compute_2nd (const Mapping<dim>                      &mapping,
-                     const DoFHandler<dim>::cell_iterator    &cell,
+                     const typename DoFHandler<dim>::cell_iterator    &cell,
                      const unsigned int                       offset,
                      typename Mapping<dim>::InternalDataBase &mapping_internal,
                      InternalDataBase                        &fe_internal,
index 337d2f95f392464f1ca76c9bd262cbc4149e5408..a062f0189528e9f83a0407e01f06676a6fe7aec7 100644 (file)
@@ -93,10 +93,10 @@ class FE_DGQ : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_values (const Mapping<dim> &mapping,
-                   const DoFHandler<dim>::cell_iterator &cell,
+                   const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                &quadrature,
-                   Mapping<dim>::InternalDataBase      &mapping_internal,
-                   Mapping<dim>::InternalDataBase      &fe_internal,
+                   typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                   typename Mapping<dim>::InternalDataBase      &fe_internal,
                    FEValuesData<dim>& data) const;
     
                                     /**
@@ -106,11 +106,11 @@ class FE_DGQ : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_face_values (const Mapping<dim> &mapping,
-                        const DoFHandler<dim>::cell_iterator &cell,
+                        const typename DoFHandler<dim>::cell_iterator &cell,
                         const unsigned int                    face_no,
                         const Quadrature<dim-1>                &quadrature,
-                        Mapping<dim>::InternalDataBase      &mapping_internal,
-                        Mapping<dim>::InternalDataBase      &fe_internal,
+                        typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                        typename Mapping<dim>::InternalDataBase      &fe_internal,
                         FEValuesData<dim>& data) const ;
     
                                     /**
@@ -120,12 +120,12 @@ class FE_DGQ : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_subface_values (const Mapping<dim> &mapping,
-                           const DoFHandler<dim>::cell_iterator &cell,
+                           const typename DoFHandler<dim>::cell_iterator &cell,
                            const unsigned int                    face_no,
                            const unsigned int                    sub_no,
                            const Quadrature<dim-1>                &quadrature,
-                           Mapping<dim>::InternalDataBase      &mapping_internal,
-                           Mapping<dim>::InternalDataBase      &fe_internal,
+                           typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                           typename Mapping<dim>::InternalDataBase      &fe_internal,
                            FEValuesData<dim>& data) const ;
 
   private:
index 463071a48bf907a738b9403c687a6653f51be9d5..77e4d320276ee3893679eee7bf3057e1e3108620 100644 (file)
@@ -304,10 +304,10 @@ class FE_Q : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_values (const Mapping<dim> &mapping,
-                   const DoFHandler<dim>::cell_iterator &cell,
+                   const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                &quadrature,
-                   Mapping<dim>::InternalDataBase      &mapping_internal,
-                   Mapping<dim>::InternalDataBase      &fe_internal,
+                   typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                   typename Mapping<dim>::InternalDataBase      &fe_internal,
                    FEValuesData<dim>& data) const;
     
                                     /**
@@ -317,11 +317,11 @@ class FE_Q : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_face_values (const Mapping<dim> &mapping,
-                        const DoFHandler<dim>::cell_iterator &cell,
+                        const typename DoFHandler<dim>::cell_iterator &cell,
                         const unsigned int                    face_no,
                         const Quadrature<dim-1>                &quadrature,
-                        Mapping<dim>::InternalDataBase      &mapping_internal,
-                        Mapping<dim>::InternalDataBase      &fe_internal,
+                        typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                        typename Mapping<dim>::InternalDataBase      &fe_internal,
                         FEValuesData<dim>& data) const ;
     
                                     /**
@@ -331,12 +331,12 @@ class FE_Q : public FiniteElement<dim>
                                      */
     virtual void
     fill_fe_subface_values (const Mapping<dim> &mapping,
-                           const DoFHandler<dim>::cell_iterator &cell,
+                           const typename DoFHandler<dim>::cell_iterator &cell,
                            const unsigned int                    face_no,
                            const unsigned int                    sub_no,
                            const Quadrature<dim-1>                &quadrature,
-                           Mapping<dim>::InternalDataBase      &mapping_internal,
-                           Mapping<dim>::InternalDataBase      &fe_internal,
+                           typename Mapping<dim>::InternalDataBase      &mapping_internal,
+                           typename Mapping<dim>::InternalDataBase      &fe_internal,
                            FEValuesData<dim>& data) const ;
 
   private:
index cbbfdc05d8d8ae8fe0bc49d84994fca8494bed1d..814523e3e2835bee0efddc5db74bbddbad6b85a9 100644 (file)
@@ -593,7 +593,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      * to the @p{get_function_*} functions
                                      * safer.
                                      */
-    DoFHandler<dim>::cell_iterator present_cell;
+    typename DoFHandler<dim>::cell_iterator present_cell;
 
                                     /**
                                      * Storage for the mapping object.
index 4d26b53b69363644a9dbbc7173f3e7ea8174b4b0..ad885289742a6c992a2e0f2484dce31ac6affe36 100644 (file)
@@ -60,9 +60,9 @@ class MappingCartesian : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    fill_fe_values (const DoFHandler<dim>::cell_iterator &cell,
+    fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>& quadrature,
-                   Mapping<dim>::InternalDataBase &mapping_data,
+                   typename Mapping<dim>::InternalDataBase &mapping_data,
                    std::vector<Point<dim> >        &quadrature_points,
                    std::vector<double>             &JxW_values) const ;
 
index 8e2d3c860284b76ca7bf7c743e0f4b81bc674204..ef8cc90ed12978358e28585706a689750644c6d3 100644 (file)
@@ -121,9 +121,9 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    fill_fe_values (const DoFHandler<dim>::cell_iterator &cell,
+    fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                &quadrature,
-                   Mapping<dim>::InternalDataBase       &mapping_data,
+                   typename Mapping<dim>::InternalDataBase       &mapping_data,
                    std::vector<Point<dim> >             &quadrature_points,
                    std::vector<double>                  &JxW_values) const ;
 
@@ -132,10 +132,10 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    fill_fe_face_values (const DoFHandler<dim>::cell_iterator &cell,
+    fill_fe_face_values (const typename DoFHandler<dim>::cell_iterator &cell,
                         const unsigned int face_no,
                         const Quadrature<dim-1>& quadrature,
-                        Mapping<dim>::InternalDataBase &mapping_data,
+                        typename Mapping<dim>::InternalDataBase &mapping_data,
                         std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>             &JxW_values,
                         std::vector<Tensor<1,dim> >        &exterior_form,
@@ -403,7 +403,7 @@ class MappingQ : public MappingQ1<dim>
                                      * @p{compute_support_points_simple}
                                      */
 //TODO:[RH] (later) remove this function altogether?    
-    void fill_quad_support_points_simple (const Triangulation<dim>::cell_iterator &cell,
+    void fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &cell,
                                          std::vector<Point<dim> > &a) const;
     
                                     /**
index 7d15d8310a4314b7f959c20a0d3464c22114cb42..38b1ddbcb73a66ac35f10db2cf3a5ed57a581ce3 100644 (file)
@@ -121,9 +121,9 @@ class MappingQ1 : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    fill_fe_values (const DoFHandler<dim>::cell_iterator &cell,
+    fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>& quadrature,
-                   Mapping<dim>::InternalDataBase &mapping_data,
+                   typename Mapping<dim>::InternalDataBase &mapping_data,
                    std::vector<Point<dim> >        &quadrature_points,
                    std::vector<double>             &JxW_values) const ;
 
index 7385e2a39ae60a1978f6e4fe797ac737d5567974..8874e31296235ceaad76d53fa4c4dfdc21e4eccb 100644 (file)
@@ -79,9 +79,9 @@ Multigrid<dim>::copy_to_mg (const Vector<number>& osrc)
                                   // already have built.
   for (int level=maxlevel; level>=static_cast<int>(minlevel); --level)
     {
-      MGDoFHandler<dim>::active_cell_iterator
+      typename MGDoFHandler<dim>::active_cell_iterator
        level_cell = mg_dof_handler->begin_active(level);
-      const MGDoFHandler<dim>::active_cell_iterator
+      const typename MGDoFHandler<dim>::active_cell_iterator
        level_end  = mg_dof_handler->end_active(level);
 
 //TODO:[?] Treat hanging nodes properly
@@ -108,7 +108,8 @@ Multigrid<dim>::copy_to_mg (const Vector<number>& osrc)
 
          for (unsigned int face_n=0; face_n<GeometryInfo<dim>::faces_per_cell; ++face_n)
            {
-             const MGDoFHandler<dim>::face_iterator face = level_cell->face(face_n);
+             const typename MGDoFHandler<dim>::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<dim>::copy_from_mg(Vector<number> &dst) const
   std::vector<unsigned int> global_dof_indices (dofs_per_cell);
   std::vector<unsigned int> level_dof_indices (dofs_per_cell);
 
-  MGDoFHandler<dim>::active_cell_iterator
+  typename MGDoFHandler<dim>::active_cell_iterator
     level_cell = mg_dof_handler->begin_active();
-  const MGDoFHandler<dim>::active_cell_iterator
+  const typename MGDoFHandler<dim>::active_cell_iterator
     endc = mg_dof_handler->end();
 
                                   // traverse all cells and copy the
@@ -202,11 +203,11 @@ Multigrid<dim>::print_vector (const unsigned int level,
   std::vector<unsigned int> global_dof_indices (dofs_per_cell);
   std::vector<unsigned int> level_dof_indices (dofs_per_cell);
 
-  DoFHandler<dim>::active_cell_iterator
+  typename DoFHandler<dim>::active_cell_iterator
     global_cell = dof->begin_active(level);
-  MGDoFHandler<dim>::active_cell_iterator
+  typename MGDoFHandler<dim>::active_cell_iterator
     level_cell = mg_dof_handler->begin_active(level);
-  const MGDoFHandler<dim>::cell_iterator
+  const typename MGDoFHandler<dim>::cell_iterator
     endc = mg_dof_handler->end(level);
 
                                   // traverse all cells and copy the
index 14ccdeacf84338ffecaee98f24180e69a8137f9d..c6e3a3f77de465a34300eed98aa605ff922d03c4 100644 (file)
@@ -54,8 +54,8 @@ DoFTools::make_sparsity_pattern (const DoFHandler<dim> &dof,
 
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(dofs_per_cell);
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::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<dim>                 &dof,
 
 
   std::vector<unsigned int> dofs_on_this_cell(dofs_per_cell);
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::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<dim> &dof,
   const unsigned int total_dofs = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(total_dofs);
   std::vector<unsigned int> dofs_on_other_cell(total_dofs);
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
+                                                endc = dof.end();
 
                                   // clear user flags for further use
   const_cast<Triangulation<dim>&>(dof.get_tria()).clear_user_flags();
@@ -321,13 +321,14 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler<dim> &dof,
           face < GeometryInfo<dim>::faces_per_cell;
           ++face)
        {
-         DoFHandler<dim>::face_iterator cell_face = cell->face(face);
+         typename DoFHandler<dim>::face_iterator cell_face = cell->face(face);
          if (cell_face->user_flag_set ())
            continue;
 
          if (! cell->at_boundary (face) )
            {
-             DoFHandler<dim>::cell_iterator neighbor = cell->neighbor(face);
+             typename DoFHandler<dim>::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<dim> &dof,
                       sub_nr != GeometryInfo<dim>::subfaces_per_face;
                       ++sub_nr)
                    {
-                     DoFHandler<dim>::cell_iterator sub_neighbor
+                     typename DoFHandler<dim>::cell_iterator sub_neighbor
                        = neighbor->
                        child(GeometryInfo<dim>::child_cell_on_face(neighbor_face, sub_nr));
 
@@ -405,8 +406,8 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler<dim> &dof,
   const unsigned int total_dofs = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(total_dofs);
   std::vector<unsigned int> dofs_on_other_cell(total_dofs);
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
+                                                endc = dof.end();
 
 
   std::vector<std::vector<bool> > int_dof_mask(total_dofs,
@@ -442,13 +443,14 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler<dim> &dof,
           face < GeometryInfo<dim>::faces_per_cell;
           ++face)
        {
-         DoFHandler<dim>::face_iterator cell_face = cell->face(face);
+         typename DoFHandler<dim>::face_iterator cell_face = cell->face(face);
          if (cell_face->user_flag_set ())
            continue;
 
          if (! cell->at_boundary (face) )
            {
-             DoFHandler<dim>::cell_iterator neighbor = cell->neighbor(face);
+             typename DoFHandler<dim>::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<dim> &dof,
                       sub_nr != GeometryInfo<dim>::subfaces_per_face;
                       ++sub_nr)
                    {
-                     DoFHandler<dim>::cell_iterator sub_neighbor
+                     typename DoFHandler<dim>::cell_iterator sub_neighbor
                        = neighbor->
                        child(GeometryInfo<dim>::child_cell_on_face(neighbor_face, sub_nr));
 
@@ -771,8 +773,9 @@ void DoFTools::distribute_cell_to_dof_vector (const DoFHandler<dim> &dof_handler
                                   // in the sum for each dof
   std::vector<unsigned char> touch_count (dof_handler.n_dofs(), 0);
 
-  DoFHandler<dim>::active_cell_iterator cell = dof_handler.begin_active(),
-                                       endc = dof_handler.end();
+  typename DoFHandler<dim>::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<unsigned int> dof_indices (dofs_per_cell);
@@ -831,7 +834,7 @@ DoFTools::extract_dofs (const DoFHandler<dim>      &dof,
   
   std::vector<unsigned int> indices(fe.dofs_per_cell);
   
-  DoFHandler<dim>::active_cell_iterator c;
+  typename DoFHandler<dim>::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<unsigned int> indices(fe.dofs_per_cell);
   
-  MGDoFHandler<dim>::cell_iterator c;
+  typename MGDoFHandler<dim>::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<dim>         &dof_handler,
                                   // line is also part of a boundary
                                   // face which we will be visiting
                                   // sooner or later
-  for (DoFHandler<dim>::active_cell_iterator cell=dof_handler.begin_active();
+  for (typename DoFHandler<dim>::active_cell_iterator
+        cell=dof_handler.begin_active();
        cell!=dof_handler.end(); ++cell)
     for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
       if (cell->at_boundary(face))
@@ -1282,7 +1286,8 @@ DoFTools::compute_intergrid_constraints (const DoFHandler<dim>              &coa
       std::vector<bool> dof_is_interesting (fine_grid.n_dofs(), false);
       std::vector<unsigned int>  local_dof_indices (fine_fe.dofs_per_cell);
       
-      for (DoFHandler<dim>::active_cell_iterator cell=fine_grid.begin_active();
+      for (typename DoFHandler<dim>::active_cell_iterator
+            cell=fine_grid.begin_active();
           cell!=fine_grid.end(); ++cell)
        {
          cell->get_dof_indices (local_dof_indices);
index de305f61c88acbb219cef69579a0fa48ac883156..0b2fda48711101114fd16a3247ecdfbd5863f6b1 100644 (file)
@@ -296,9 +296,9 @@ template <int dim>
 void
 FiniteElementBase<dim>::
 compute_2nd (const Mapping<dim>                   &mapping,
-            const DoFHandler<dim>::cell_iterator &cell,
+            const typename DoFHandler<dim>::cell_iterator &cell,
             const unsigned int                    offset,
-            Mapping<dim>::InternalDataBase       &mapping_internal,
+            typename Mapping<dim>::InternalDataBase &mapping_internal,
             InternalDataBase                     &fe_internal,
             FEValuesData<dim>                    &data) const
 {
index 62362176fa20ba769c019af7b83dc7e8f6ba832a..8e7fc91c0179359073c103b3b6f09ac6b1db6e80 100644 (file)
@@ -426,10 +426,10 @@ FE_DGQ<dim>::get_data (const UpdateFlags      update_flags,
 template <int dim>
 void
 FE_DGQ<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
-                            const DoFHandler<dim>::cell_iterator &cell,
+                            const typename DoFHandler<dim>::cell_iterator &cell,
                             const Quadrature<dim>                &quadrature,
-                            Mapping<dim>::InternalDataBase       &mapping_data,
-                            Mapping<dim>::InternalDataBase       &fedata,
+                            typename Mapping<dim>::InternalDataBase       &mapping_data,
+                            typename Mapping<dim>::InternalDataBase       &fedata,
                             FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
@@ -463,11 +463,11 @@ FE_DGQ<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
 template <int dim>
 void
 FE_DGQ<dim>::fill_fe_face_values (const Mapping<dim>                   &mapping,
-                                 const DoFHandler<dim>::cell_iterator &cell,
+                                 const typename DoFHandler<dim>::cell_iterator &cell,
                                  const unsigned int                    face,
                                  const Quadrature<dim-1>              &quadrature,
-                                 Mapping<dim>::InternalDataBase       &mapping_data,
-                                 Mapping<dim>::InternalDataBase       &fedata,
+                                 typename Mapping<dim>::InternalDataBase       &mapping_data,
+                                 typename Mapping<dim>::InternalDataBase       &fedata,
                                  FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
@@ -506,12 +506,12 @@ FE_DGQ<dim>::fill_fe_face_values (const Mapping<dim>                   &mapping,
 template <int dim>
 void
 FE_DGQ<dim>::fill_fe_subface_values (const Mapping<dim>                   &mapping,
-                                    const DoFHandler<dim>::cell_iterator &cell,
+                                    const typename DoFHandler<dim>::cell_iterator &cell,
                                     const unsigned int                    face,
                                     const unsigned int                    subface,
                                     const Quadrature<dim-1>              &quadrature,
-                                    Mapping<dim>::InternalDataBase       &mapping_data,
-                                    Mapping<dim>::InternalDataBase       &fedata,
+                                    typename Mapping<dim>::InternalDataBase       &mapping_data,
+                                    typename Mapping<dim>::InternalDataBase       &fedata,
                                     FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
index 7fcf0b9d6f111ce2fd58d7bc76c6d8b69f10cb1f..51eff18833a3457be46249464b7a9dfec0fec649 100644 (file)
@@ -1024,10 +1024,10 @@ FE_Q<dim>::get_data (const UpdateFlags      update_flags,
 template <int dim>
 void
 FE_Q<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
-                          const DoFHandler<dim>::cell_iterator &cell,
+                          const typename DoFHandler<dim>::cell_iterator &cell,
                           const Quadrature<dim>                &quadrature,
-                          Mapping<dim>::InternalDataBase       &mapping_data,
-                          Mapping<dim>::InternalDataBase       &fedata,
+                          typename Mapping<dim>::InternalDataBase &mapping_data,
+                          typename Mapping<dim>::InternalDataBase &fedata,
                           FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
@@ -1061,11 +1061,11 @@ FE_Q<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
 template <int dim>
 void
 FE_Q<dim>::fill_fe_face_values (const Mapping<dim>                   &mapping,
-                               const DoFHandler<dim>::cell_iterator &cell,
+                               const typename DoFHandler<dim>::cell_iterator &cell,
                                const unsigned int                    face,
                                const Quadrature<dim-1>              &quadrature,
-                               Mapping<dim>::InternalDataBase       &mapping_data,
-                               Mapping<dim>::InternalDataBase       &fedata,
+                               typename Mapping<dim>::InternalDataBase       &mapping_data,
+                               typename Mapping<dim>::InternalDataBase       &fedata,
                                FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
@@ -1104,12 +1104,12 @@ FE_Q<dim>::fill_fe_face_values (const Mapping<dim>                   &mapping,
 template <int dim>
 void
 FE_Q<dim>::fill_fe_subface_values (const Mapping<dim>                   &mapping,
-                                  const DoFHandler<dim>::cell_iterator &cell,
+                                  const typename DoFHandler<dim>::cell_iterator &cell,
                                   const unsigned int                    face,
                                   const unsigned int                    subface,
                                   const Quadrature<dim-1>              &quadrature,
-                                  Mapping<dim>::InternalDataBase       &mapping_data,
-                                  Mapping<dim>::InternalDataBase       &fedata,
+                                  typename Mapping<dim>::InternalDataBase       &mapping_data,
+                                  typename Mapping<dim>::InternalDataBase       &fedata,
                                   FEValuesData<dim>                    &data) const
 {
                                   // convert data object to internal
index 8febc2ce28ece03a03b326dd0168f8fbb458e1db..7f241821ad4fc45ac3c9b7743d22b608271b3395 100644 (file)
@@ -358,10 +358,10 @@ FESystem<dim>::get_data (UpdateFlags      flags,
 template <int dim>
 void
 FESystem<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
-                              const DoFHandler<dim>::cell_iterator &cell,
+                              const typename DoFHandler<dim>::cell_iterator &cell,
                               const Quadrature<dim>                &quadrature,
-                              Mapping<dim>::InternalDataBase       &mapping_data,
-                              Mapping<dim>::InternalDataBase       &fe_data,
+                              typename Mapping<dim>::InternalDataBase       &mapping_data,
+                              typename Mapping<dim>::InternalDataBase       &fe_data,
                               FEValuesData<dim>                    &data) const
 {
   compute_fill(mapping, cell, invalid_face_number, invalid_face_number,
@@ -373,11 +373,11 @@ FESystem<dim>::fill_fe_values (const Mapping<dim>                   &mapping,
 template <int dim>
 void
 FESystem<dim>::fill_fe_face_values (const Mapping<dim>                   &mapping,
-                                   const DoFHandler<dim>::cell_iterator &cell,
+                                   const typename DoFHandler<dim>::cell_iterator &cell,
                                    const unsigned int                    face_no,
                                    const Quadrature<dim-1>              &quadrature,
-                                   Mapping<dim>::InternalDataBase       &mapping_data,
-                                   Mapping<dim>::InternalDataBase       &fe_data,
+                                   typename Mapping<dim>::InternalDataBase       &mapping_data,
+                                   typename Mapping<dim>::InternalDataBase       &fe_data,
                                    FEValuesData<dim>                    &data) const
 {
   compute_fill(mapping, cell, face_no, invalid_face_number,
@@ -390,12 +390,12 @@ FESystem<dim>::fill_fe_face_values (const Mapping<dim>                   &mappin
 template <int dim>
 void
 FESystem<dim>::fill_fe_subface_values (const Mapping<dim>                   &mapping,
-                                      const DoFHandler<dim>::cell_iterator &cell,
+                                      const typename DoFHandler<dim>::cell_iterator &cell,
                                       const unsigned int                    face_no,
                                       const unsigned int                    sub_no,
                                       const Quadrature<dim-1>              &quadrature,
-                                      Mapping<dim>::InternalDataBase       &mapping_data,
-                                      Mapping<dim>::InternalDataBase       &fe_data,
+                                      typename Mapping<dim>::InternalDataBase       &mapping_data,
+                                      typename Mapping<dim>::InternalDataBase       &fe_data,
                                       FEValuesData<dim>                    &data) const
 {
   compute_fill(mapping, cell, face_no, sub_no,
@@ -408,12 +408,12 @@ template <int dim>
 template <int dim_1>
 void
 FESystem<dim>::compute_fill (const Mapping<dim>                   &mapping,
-                            const DoFHandler<dim>::cell_iterator &cell,
+                            const typename DoFHandler<dim>::cell_iterator &cell,
                             const unsigned int                    face_no,
                             const unsigned int                    sub_no,
                             const Quadrature<dim_1>              &quadrature,
-                            Mapping<dim>::InternalDataBase       &mapping_data,
-                            Mapping<dim>::InternalDataBase       &fedata,
+                            typename Mapping<dim>::InternalDataBase       &mapping_data,
+                            typename Mapping<dim>::InternalDataBase       &fedata,
                             FEValuesData<dim>                    &data) const
 {       
                                   // convert data object to internal
index ceda68baf7cb87544aa29a80d76f22ca09ec9b94..2c6ba570f35ac34ad44f57e1575368f9bf9d045c 100644 (file)
@@ -161,10 +161,10 @@ void FETools::interpolate(const DoFHandler<dim> &dof1,
   FETools::get_interpolation_matrix(dof1.get_fe(), dof2.get_fe(),
                                    interpolation_matrix);
   
-  DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
-                                       endc1 = dof1.end(),
-                                       cell2 = dof2.begin_active(),
-                                       endc2 = dof2.end();
+  typename DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
+                                                endc1 = dof1.end(),
+                                                cell2 = dof2.begin_active(),
+                                                endc2 = dof2.end();
 
   std::vector<unsigned int> index_multiplicity(dof2.n_dofs(),0);
   std::vector<unsigned int> dofs (dofs_per_cell2);
@@ -211,8 +211,8 @@ void FETools::back_interpolate(const DoFHandler<dim> &dof1,
   FETools::get_back_interpolation_matrix(dof1.get_fe(), fe2,
                                         interpolation_matrix);
 
-  DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
-                                       endc1 = dof1.end();
+  typename DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
+                                                endc1 = dof1.end();
   
   for (; cell1!=endc1; ++cell1) 
     {
@@ -245,8 +245,8 @@ void FETools::interpolation_difference(const DoFHandler<dim> &dof1,
   FETools::get_interpolation_difference_matrix(dof1.get_fe(), fe2,
                                               difference_matrix);
   
-  DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
-                                       endc1 = dof1.end();
+  typename DoFHandler<dim>::active_cell_iterator cell1 = dof1.begin_active(),
+                                                endc1 = dof1.end();
   
   for (; cell1!=endc1; ++cell1) 
     {
index e30e77c75a60536f224892eca12afd537f05eb19..f6b1662c451f08afd9b553898d115bff33a03c24 100644 (file)
@@ -244,11 +244,11 @@ MappingCartesian<dim>::compute_fill (const typename DoFHandler<dim>::cell_iterat
 
 template <int dim>
 void
-MappingCartesian<dim>::fill_fe_values (const DoFHandler<dim>::cell_iterator& cell,
-                               const Quadrature<dim>& q, 
-                               Mapping<dim>::InternalDataBase& mapping_data,
-                               std::vector<Point<dim> >& quadrature_points,
-                               std::vector<double>& JxW_values) const
+MappingCartesian<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iterator& cell,
+                                      const Quadrature<dim>& q, 
+                                      typename Mapping<dim>::InternalDataBase& mapping_data,
+                                      std::vector<Point<dim> >& quadrature_points,
+                                      std::vector<double>& JxW_values) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index e2f009f245106d3e389532b6cf1b35ebd0c94010..dd63000fd8d92d2c3d7802a23671d4a3d3447ece 100644 (file)
@@ -238,9 +238,9 @@ MappingQ<dim>::get_subface_data (const UpdateFlags update_flags,
 
 template <int dim>
 void
-MappingQ<dim>::fill_fe_values (const DoFHandler<dim>::cell_iterator &cell,
+MappingQ<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                               const Quadrature<dim>                &q,
-                              Mapping<dim>::InternalDataBase       &mapping_data,
+                              typename Mapping<dim>::InternalDataBase       &mapping_data,
                               std::vector<Point<dim> >             &quadrature_points,
                               std::vector<double>                  &JxW_values) const
 {
@@ -861,7 +861,7 @@ MappingQ<1>::add_line_support_points (const Triangulation<1>::cell_iterator &,
 
 template <int dim>
 void
-MappingQ<dim>::add_line_support_points (const Triangulation<dim>::cell_iterator &cell,
+MappingQ<dim>::add_line_support_points (const typename Triangulation<dim>::cell_iterator &cell,
                                        std::vector<Point<dim> > &a) const
 {
   static const StraightBoundary<dim> straight_boundary;
@@ -1090,7 +1090,7 @@ MappingQ<3>::fill_quad_support_points_simple (const Triangulation<3>::cell_itera
 
 template <int dim>
 void
-MappingQ<dim>::fill_quad_support_points_simple (const Triangulation<dim>::cell_iterator &,
+MappingQ<dim>::fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &,
                                                std::vector<Point<dim> > &) const
 {}
 
index a5c06d38a790eb0b64cb33d2164df7e4f1f56e2a..821fd03927e501c8a9eed9659a8ec6382cf126f7 100644 (file)
@@ -552,9 +552,9 @@ MappingQ1<dim>::compute_mapping_support_points(
 
 template <int dim>
 void
-MappingQ1<dim>::fill_fe_values (const DoFHandler<dim>::cell_iterator &cell,
+MappingQ1<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                                const Quadrature<dim>                &q,
-                               Mapping<dim>::InternalDataBase      &mapping_data,
+                               typename Mapping<dim>::InternalDataBase      &mapping_data,
                                std::vector<Point<dim> >                  &quadrature_points,
                                std::vector<double>                       &JxW_values) const
 {
index 78fc311943ecafb85a6006a6f68e49b5cc75ed9c..88fb0757c41b6fc91af9547095d46df8242246be 100644 (file)
@@ -554,8 +554,9 @@ void GridOut::write_eps (const Triangulation<dim> &tria,
        
       case 2:
       {
-       Triangulation<dim>::active_line_iterator line   =tria.begin_active_line ();
-       Triangulation<dim>::active_line_iterator endline=tria.end_line ();
+       typename Triangulation<dim>::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<dim> &tria,
 //TODO:[RH] curved boundaries in eps for 3d    
        Assert (mapping == 0, ExcNotImplemented());
        
-       Triangulation<dim>::active_line_iterator line   =tria.begin_active_line ();
-       Triangulation<dim>::active_line_iterator endline=tria.end_line ();
+       typename Triangulation<dim>::active_line_iterator
+         line   =tria.begin_active_line (),
+         endline=tria.end_line ();
        
                                         // loop over all lines and compute their
                                         // projection on the plane perpendicular
index 9b401846bd111195ab6b737946944d7aac47e914..06668ad00f0b3ca841e9671717b89255c72b8775 100644 (file)
@@ -91,7 +91,7 @@ void GridRefinement::refine (Triangulation<dim>   &tria,
   if (threshold==0)
     return;
   
-  Triangulation<dim>::active_cell_iterator cell = tria.begin_active();
+  typename Triangulation<dim>::active_cell_iterator cell = tria.begin_active();
   const unsigned int n_cells = criteria.size();
   
   for (unsigned int index=0; index<n_cells; ++cell, ++index)
@@ -111,7 +111,7 @@ void GridRefinement::coarsen (Triangulation<dim>   &tria,
   Assert (*std::min_element(criteria.begin(), criteria.end()) >= 0,
          ExcInvalidParameterValue());
 
-  Triangulation<dim>::active_cell_iterator cell = tria.begin_active();
+  typename Triangulation<dim>::active_cell_iterator cell = tria.begin_active();
   const unsigned int n_cells = criteria.size();
   
   for (unsigned int index=0; index<n_cells; ++cell, ++index)
index 8d14f058de73547e7c39c70aa9457f39443475eb..4e56c909e9d7a9892a822cf9efcde9069dac0c87 100644 (file)
@@ -233,7 +233,7 @@ HyperBallBoundary<3>::get_intermediate_points_on_quad (
 template <int dim>
 void
 HyperBallBoundary<dim>::get_intermediate_points_on_quad (
-  const Triangulation<dim>::quad_iterator &,
+  const typename Triangulation<dim>::quad_iterator &,
   typename std::vector<Point<dim> > &) const
 {
   Assert(false, Boundary<dim>::ExcFunctionNotUseful(dim));
@@ -258,7 +258,7 @@ get_normals_at_vertices (const Triangulation<1>::face_iterator &,
 template <int dim>
 void
 HyperBallBoundary<dim>::
-get_normals_at_vertices (const Triangulation<dim>::face_iterator &face,
+get_normals_at_vertices (const typename Triangulation<dim>::face_iterator &face,
                         typename Boundary<dim>::FaceVertexNormals &face_vertex_normals) const
 {
   for (unsigned int vertex=0; vertex<GeometryInfo<dim>::vertices_per_face; ++vertex)
index b59f07bf57eba9d72a06649da35190cbf5c8dc67..671bb3fb308d52809221c122cfa4be13e656918f 100644 (file)
@@ -35,8 +35,8 @@ void MGDoFTools::make_sparsity_pattern (const MGDoFHandler<dim> &dof,
 
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(dofs_per_cell);
-  MGDoFHandler<dim>::cell_iterator cell = dof.begin(level),
-                                  endc = dof.end(level);
+  typename MGDoFHandler<dim>::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<dim> &dof,
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(dofs_per_cell);
   std::vector<unsigned int> dofs_on_other_cell(dofs_per_cell);
-  MGDoFHandler<dim>::cell_iterator cell = dof.begin(level),
-                                  endc = dof.end(level);
+  typename MGDoFHandler<dim>::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<dim> &dof,
          if ( (! cell->at_boundary(face)) &&
               (static_cast<unsigned int>(cell->neighbor_level(face)) == level) )
            {
-             MGDoFHandler<dim>::cell_iterator neighbor = cell->neighbor(face);
+             typename MGDoFHandler<dim>::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<dim> &dof,
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(dofs_per_cell);
   std::vector<unsigned int> dofs_on_other_cell(dofs_per_cell);
-  MGDoFHandler<dim>::cell_iterator cell = dof.begin(level),
-                                  endc = dof.end(level);
+  typename MGDoFHandler<dim>::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<dim> &dof,
          if ( (! cell->at_boundary(face)) &&
               (static_cast<unsigned int>(cell->neighbor_level(face)) != level) )
            {
-             MGDoFHandler<dim>::cell_iterator neighbor = cell->neighbor(face);
+             typename MGDoFHandler<dim>::cell_iterator
+               neighbor = cell->neighbor(face);
              neighbor->get_mg_dof_indices (dofs_on_other_cell);
 
              for (unsigned int i=0; i<dofs_per_cell; ++i)
@@ -189,8 +191,8 @@ MGDoFTools::make_flux_sparsity_pattern (const MGDoFHandler<dim> &dof,
   const unsigned int total_dofs = dof.get_fe().dofs_per_cell;
   std::vector<unsigned int> dofs_on_this_cell(total_dofs);
   std::vector<unsigned int> dofs_on_other_cell(total_dofs);
-  MGDoFHandler<dim>::cell_iterator cell = dof.begin(level),
-                                  endc = dof.end(level);
+  typename MGDoFHandler<dim>::cell_iterator cell = dof.begin(level),
+                                           endc = dof.end(level);
 
 
   std::vector<std::vector<bool> > int_dof_mask(total_dofs,
@@ -226,13 +228,14 @@ MGDoFTools::make_flux_sparsity_pattern (const MGDoFHandler<dim> &dof,
           face < GeometryInfo<dim>::faces_per_cell;
           ++face)
        {
-         MGDoFHandler<dim>::face_iterator cell_face = cell->face(face);
+         typename MGDoFHandler<dim>::face_iterator cell_face = cell->face(face);
          if (cell_face->user_flag_set ())
            continue;
 
          if (! cell->at_boundary (face) )
            {
-             MGDoFHandler<dim>::cell_iterator neighbor = cell->neighbor(face);
+             typename MGDoFHandler<dim>::cell_iterator
+               neighbor = cell->neighbor(face);
 
              if (neighbor->level() < cell->level())
                continue;
index ce12e5069a0cb1dd8f3618406a635b174f9dacb8..ed80acf359963b8bf48327a3bfc528f46e0e681f 100644 (file)
@@ -88,7 +88,7 @@ MGSmoother::MGSmoother (const MGDoFHandler<dim> &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<dim>::cell_iterator cell=mg_dof.begin(level);
+      for (typename MGDoFHandler<dim>::cell_iterator cell=mg_dof.begin(level);
           cell != mg_dof.end(level); ++cell)
        for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
          if ((cell->neighbor(face).state() == valid) &&
index 6ad73f4abc14313c8fd641a4175d2cda035ae8c9..6861fcd10012edfce0096f75406c4139060ca0c1 100644 (file)
@@ -135,8 +135,8 @@ void MGTransferPrebuilt::build_matrices (const MGDoFHandler<dim> &mg_dof)
       prolongation_matrices.push_back (SparseMatrix<double>());
       prolongation_matrices[level].reinit (prolongation_sparsities[level]);
 
-// now actually build the matrices
-      for (MGDoFHandler<dim>::cell_iterator cell=mg_dof.begin(level);
+                                      // now actually build the matrices
+      for (typename MGDoFHandler<dim>::cell_iterator cell=mg_dof.begin(level);
           cell != mg_dof.end(level); ++cell)
        if (cell->has_children())
          {
index 6593b8c135e0e94e1bd0a98e18d0be8474d0941a..b2d889fbba7fae5ca1c61c70f364750f2b704b1b 100644 (file)
@@ -316,7 +316,7 @@ void DataOut<dim>::build_some_patches (Data data)
   
   unsigned int cell_number = 0;
   typename std::vector<DataOutBase::Patch<dim> >::iterator patch = patches.begin();
-  DoFHandler<dim>::cell_iterator cell=first_cell();
+  typename DoFHandler<dim>::cell_iterator cell=first_cell();
 
                                   // get first cell in this thread
   for (unsigned int i=0; (i<data.this_thread)&&(cell != dofs->end()); ++i)
@@ -427,7 +427,7 @@ void DataOut<dim>::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<dim>::cell_iterator cell=first_cell();
+  for (typename DoFHandler<dim>::cell_iterator cell=first_cell();
        cell != dofs->end();
        cell = next_cell(cell))
     ++n_patches;
index 39081edcbde6e27688959aca5a0be84c7f271f63..7d14c47f56579b754dbadcb658583365c7772fe5 100644 (file)
@@ -347,7 +347,7 @@ void DataOutRotation<dim>::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<dim>::cell_iterator cell=first_cell();
+  for (typename DoFHandler<dim>::cell_iterator cell=first_cell();
        cell != dofs->end();
        cell = next_cell(cell))
     ++n_patches;
index 62de438914d53e7314c9e096e6d27e5e1ef6a9de..7cc13423a375183b784d6e05f5b5b88f21c9fa10 100644 (file)
@@ -207,7 +207,8 @@ void DataOutStack<dim>::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<dim>::active_cell_iterator cell=dof_handler->begin_active();
+  for (typename DoFHandler<dim>::active_cell_iterator
+        cell=dof_handler->begin_active();
        cell != dof_handler->end(); ++cell)
     ++n_patches;
 
index 7e217776bb1e99c0fd638a08e2215cfe88be8e7f..61d76434dfd01dcf6111eb1f229811c89ee2793c 100644 (file)
@@ -73,8 +73,8 @@ void SolutionTransfer<dim, number>::prepare_for_pure_refinement()
   indices_on_cell=std::vector<std::vector<unsigned int> > (n_active_cells,
                                                 std::vector<unsigned int> (dofs_per_cell));
 
-  DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
-                                endc = dof_handler->end();
+  typename DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
+                                         endc = dof_handler->end();
 
   for (unsigned int i=0; cell!=endc; ++cell) 
     {
@@ -112,8 +112,8 @@ SolutionTransfer<dim, number>::refine_interpolate(const Vector<number> &in,
   unsigned int dofs_per_cell=dof_handler->get_fe().dofs_per_cell;  
   Vector<number> local_values(dofs_per_cell);
 
-  DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
-                                endc = dof_handler->end();
+  typename DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
+                                         endc = dof_handler->end();
 
   std::vector<unsigned int> *indexptr;  
 
@@ -177,8 +177,9 @@ prepare_for_coarsening_and_refinement(const typename std::vector<Vector<number>
                                   // and that'll stay or be refined
   unsigned int n_cells_to_coarsen=0;
   unsigned int n_cells_to_stay_or_refine=0;
-  DoFHandler<dim>::active_cell_iterator act_cell = dof_handler->begin_active(),
-                                           endc = dof_handler->end();
+  typename DoFHandler<dim>::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<Vector<number>
                                   // and all the cells where a
                                   // @p{Pointerstruct} is needed 'n'
   unsigned int n_sr=0, n_cf=0, n=0;
-  DoFHandler<dim>::cell_iterator cell = dof_handler->begin();  
+  typename DoFHandler<dim>::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<Vector<number> > &all_in,
   std::vector<Vector<number> > *valuesptr;
   std::vector<unsigned int>     dofs(dofs_per_cell);
 
-  DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
-                                endc = dof_handler->end();
+  typename DoFHandler<dim>::cell_iterator cell = dof_handler->begin(),
+                                         endc = dof_handler->end();
   
   for (; cell!=endc; ++cell) 
     {
index 9b984df7d58744a41d8830ac7be1846b37af848b..738acdbec6305140ca8e503669e834f08116b28c 100644 (file)
@@ -525,7 +525,7 @@ void TimeStepBase_Tria<dim>::restore_grid ()
                                       // desired so
 //       if (flags.max_refinement_level != 0)
 //     {
-//       Triangulation<dim>::active_cell_iterator cell, endc;
+//       typename Triangulation<dim>::active_cell_iterator cell, endc;
 //       for (cell = tria->begin_active(),
 //            endc = tria->end();
 //            cell!=endc; ++cell)
@@ -698,11 +698,11 @@ adapt_grids (Triangulation<dim> &tria1,
 {
   bool grids_changed = false;
   
-  Triangulation<dim>::cell_iterator cell1 = tria1.begin(),
-                                   cell2 = tria2.begin();
-  Triangulation<dim>::cell_iterator endc;
+  typename Triangulation<dim>::cell_iterator cell1 = tria1.begin(),
+                                            cell2 = tria2.begin();
+  typename Triangulation<dim>::cell_iterator endc;
   endc = (tria1.n_levels() == 1 ?
-         Triangulation<dim>::cell_iterator(tria1.end()) :
+         typename Triangulation<dim>::cell_iterator(tria1.end()) :
          tria1.begin(1));
   for (; cell1!=endc; ++cell1, ++cell2)
     grids_changed |= adapt_grids<dim> (cell1, cell2);
@@ -853,7 +853,7 @@ void TimeStepBase_Tria<dim>::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<dim>::active_cell_iterator cell, endc;
+       typename Triangulation<dim>::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<dim>::refine_grid (const RefinementData refinement_data)
        {
          adapt_grids (*previous_tria, *tria);
 
-         Triangulation<dim>::cell_iterator old_cell, new_cell, endc;
+         typename Triangulation<dim>::cell_iterator old_cell, new_cell, endc;
          old_cell = previous_tria->begin(0);
          new_cell = tria->begin(0);
          endc     = tria->end(0);
index 2fc2165f46b9043423356a8f73fbe1d62ccc1013..43494b7ab270347f8e5e0fae9ca837b73a065c4c 100644 (file)
@@ -73,8 +73,8 @@ void VectorTools::interpolate (const Mapping<dim>    &mapping,
   const unsigned int        n_components = fe.n_components();
   const bool                fe_is_system = (n_components != 1);
   
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::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<dim>           &dof_1,
   std::vector<short unsigned int> touch_count (dof_2.n_dofs(), 0);
   std::vector<unsigned int>       local_dof_indices (dof_2.get_fe().dofs_per_cell);
   
-  DoFHandler<dim>::active_cell_iterator h = dof_1.begin_active();
-  DoFHandler<dim>::active_cell_iterator l = dof_2.begin_active();
-  const DoFHandler<dim>::cell_iterator endh = dof_1.end();
+  typename DoFHandler<dim>::active_cell_iterator h = dof_1.begin_active();
+  typename DoFHandler<dim>::active_cell_iterator l = dof_2.begin_active();
+  const typename DoFHandler<dim>::cell_iterator endh = dof_1.end();
   
   for(; h != endh; ++h, ++l)
   {
@@ -986,8 +986,8 @@ VectorTools::integrate_difference (const Mapping<dim>    &mapping,
   std::vector<Tensor<1,dim> > tmp_gradients (fe_values.n_quadrature_points);
   
                                   // loop over all cells
-  DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
-                                       endc = dof.end();
+  typename DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
+                                                endc = dof.end();
   for (unsigned int index=0; cell != endc; ++cell, ++index)
     {
       double diff=0;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.