]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add a large number of 'typename's to make the IBM xlC compiler more happy. It doesn...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2001 15:02:39 +0000 (15:02 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2001 15:02:39 +0000 (15:02 +0000)
git-svn-id: https://svn.dealii.org/trunk@5061 0785d39b-7218-0410-832d-ea1e28bc413d

46 files changed:
deal.II/base/include/base/function_derivative.h
deal.II/base/include/base/function_lib.h
deal.II/base/include/base/polynomial.h
deal.II/base/include/base/tensor_product_polynomials.h
deal.II/base/include/base/thread_management.h
deal.II/base/source/auto_derivative_function.cc
deal.II/base/source/function.cc
deal.II/base/source/function_derivative.cc
deal.II/base/source/function_lib.cc
deal.II/base/source/legendre.cc
deal.II/base/source/polynomial.cc
deal.II/deal.II/include/dofs/dof_tools.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.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/fe/mapping_q1_eulerian.h
deal.II/deal.II/include/grid/grid_generator.h
deal.II/deal.II/include/grid/tria.h
deal.II/deal.II/include/grid/tria_accessor.templates.h
deal.II/deal.II/include/grid/tria_boundary.h
deal.II/deal.II/include/grid/tria_boundary_lib.h
deal.II/deal.II/include/numerics/data_out.h
deal.II/deal.II/include/numerics/solution_transfer.h
deal.II/deal.II/include/numerics/time_dependent.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_values.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_eulerian.cc
deal.II/deal.II/source/grid/grid_generator.cc
deal.II/deal.II/source/grid/grid_reordering.cc
deal.II/deal.II/source/grid/tria.cc
deal.II/deal.II/source/grid/tria_accessor.cc
deal.II/deal.II/source/grid/tria_boundary.cc
deal.II/deal.II/source/grid/tria_boundary_lib.cc
deal.II/deal.II/source/numerics/time_dependent.cc
deal.II/lac/include/lac/block_sparse_matrix.h
deal.II/lac/include/lac/block_sparsity_pattern.h
deal.II/lac/include/lac/filtered_matrix.h
deal.II/lac/include/lac/sparsity_pattern.h

index d6fe25eb7065e4386842832724265205d7d6bd15..c2c1788e739105c89e563d46c42e0044a67d6505 100644 (file)
@@ -80,7 +80,7 @@ class FunctionDerivative : public Function<dim>
                                      * values are accessed.
                                      */
     FunctionDerivative (const Function<dim>            &f,
-                       const std::vector<Point<dim> > &direction,
+                       const typename std::vector<Point<dim> > &direction,
                        const double                    h = 1.e-6);
     
                                     /**
index 11214eaa2f8830c8ad10e6824f97d19c57f36cd3..3371177c1c9e40ce102cca52c4dca6a3cdf465f6 100644 (file)
@@ -671,7 +671,7 @@ namespace Functions
                                        * coefficients in each space
                                        * direction as argument.
                                        */
-      FourierSineSum (const std::vector<Point<dim> > &fourier_coefficients,
+      FourierSineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
                      const std::vector<double>      &weights);
       
                                       /**
@@ -713,7 +713,7 @@ namespace Functions
                                        * Stored Fourier coefficients
                                        * and weights.
                                        */
-      const std::vector<Point<dim> > fourier_coefficients;
+      const typename std::vector<Point<dim> > fourier_coefficients;
       const std::vector<double>      weights;
   };
 
@@ -737,7 +737,7 @@ namespace Functions
                                        * coefficients in each space
                                        * direction as argument.
                                        */
-      FourierCosineSum (const std::vector<Point<dim> > &fourier_coefficients,
+      FourierCosineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
                        const std::vector<double>      &weights);
       
                                       /**
@@ -779,7 +779,7 @@ namespace Functions
                                        * Stored Fourier coefficients
                                        * and weights.
                                        */
-      const std::vector<Point<dim> > fourier_coefficients;
+      const typename std::vector<Point<dim> > fourier_coefficients;
       const std::vector<double>      weights;
   };
   
index 3d364e07c01f510ecb37057fe980792e603f2a75..94ea8aa0bbcdf9d09e4ab12dc3b05274d1ccdf0d 100644 (file)
@@ -49,7 +49,7 @@ class Polynomial : public Subscriptor
                                      * the @p{coefficient} array
                                      * minus one.
                                      */
-    Polynomial (const std::vector<number> &coefficients);
+    Polynomial (const typename std::vector<number> &coefficients);
 
                                      /**
                                      * Default-Constructor.
@@ -82,8 +82,8 @@ class Polynomial : public Subscriptor
                                      * scheme for numerical stability
                                      * of the evaluation.
                                      */
-    void value (const number         x,
-               std::vector<number> &values) const;
+    void value (const number                  x,
+               typename std::vector<number> &values) const;
 
                                     /**
                                      * Degree of the polynomial. This
@@ -116,7 +116,7 @@ class Polynomial : public Subscriptor
                                      * passed down by derived
                                      * classes.
                                      */
-    std::vector<number> coefficients;
+    typename std::vector<number> coefficients;
 };
 
 
@@ -205,7 +205,7 @@ class Legendre : public Polynomial<number>
                                      * vectors in order to simplify
                                      * programming multithread-safe.
                                      */
-    static std::vector<const std::vector<number>*> coefficients;
+    static typename std::vector<const typename std::vector<number> *> coefficients;
     
                                     /**
                                      * Compute coefficients recursively.
@@ -219,7 +219,7 @@ class Legendre : public Polynomial<number>
                                      * constructor of
                                      * @ref{Polynomial}.
                                      */
-    static const std::vector<number> &
+    static const typename std::vector<number> &
     get_coefficients (const unsigned int k);
 };
 
index dcdace986e2bf8ad2f098c7a6a20b67fe612aca5..d6f4a29acd88cd0bb1fe0bb6143f63ec1e29b7f6 100644 (file)
@@ -43,8 +43,8 @@ class TensorProductPolynomials
                                      * and will be copied into the
                                      * member variable @p{polynomials}.
                                      */
-    template<class Pol>
-    TensorProductPolynomials(const std::vector<Pol> &pols);
+    template <class Pol>
+    TensorProductPolynomials(const typename std::vector<Pol> &pols);
 
                                     /**
                                      * Computes the value and the
@@ -210,7 +210,7 @@ class TensorProductPolynomials
 template <int dim>
 template <class Pol>
 TensorProductPolynomials<dim>::TensorProductPolynomials(
-  const std::vector<Pol> &pols):
+  const typename std::vector<Pol> &pols):
                polynomials (pols.begin(), pols.end()),
                n_tensor_pols(power(pols.size(), dim)),
                n_pols_to(dim+1)
index dacd9ac5f7bf15cca4554fabe2d19defe7ae6973..a3ccbd5d1c434dc67a9f93a0f72e07df701a2a6d 100644 (file)
@@ -5471,7 +5471,7 @@ namespace Threads
 
   
   template <typename ForwardIterator>
-  typename std::vector<std::pair<ForwardIterator,ForwardIterator> >
+  typename std::vector<typename std::pair<ForwardIterator,ForwardIterator> >
   split_range (const ForwardIterator &begin,
               const ForwardIterator &end,
               const unsigned int     n_intervals)
index 59de4c29e177c6174e82ca6d40a7eb082dccb653..f4a770f8258d412fab3d02d3f8e9e49a50b5d7c9 100644 (file)
@@ -242,8 +242,10 @@ void AutoDerivativeFunction<dim>::gradient_list (const typename std::vector<Poin
 
 
 template <int dim>
-void AutoDerivativeFunction<dim>::vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                                       typename std::vector<std::vector<Tensor<1,dim> > > &gradients) const
+void 
+AutoDerivativeFunction<dim>::
+vector_gradient_list (const typename std::vector<Point<dim> >            &points,
+                     typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
@@ -303,7 +305,7 @@ void AutoDerivativeFunction<dim>::vector_gradient_list (const typename std::vect
 
 
 template <int dim>
-AutoDerivativeFunction<dim>::DifferenceFormula
+typename AutoDerivativeFunction<dim>::DifferenceFormula
 AutoDerivativeFunction<dim>::get_formula_of_order(const unsigned int ord)
 {
   switch (ord)
index adfda47a1a1165c58218f37da701abc96fe8b86e..3fecfc8ea4f4ee11e3ec3fa80756dfc481e439e1 100644 (file)
@@ -116,7 +116,7 @@ void Function<dim>::gradient_list (const typename std::vector<Point<dim> > &poin
 
 template <int dim>
 void Function<dim>::vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                         typename std::vector<std::vector<Tensor<1,dim> > > &gradients) const
+                                         typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
index 5b7f940164f2245962bfe4a5d51e2f077ddbe473..30fb387ce17911e90ee44d9fe01376a04bae9eb1 100644 (file)
@@ -34,7 +34,7 @@ FunctionDerivative<dim>::FunctionDerivative (const Function<dim> &f,
 
 template <int dim>
 FunctionDerivative<dim>::FunctionDerivative (const Function<dim>& f,
-                                            const std::vector<Point<dim> >& dir,
+                                            const typename std::vector<Point<dim> >& dir,
                                             const double h)
                :
                Function<dim> (f.n_components, f.get_time()),
index 3ce089862b8767264a7d864415449b597a07bd03..52af839617ed4b30c495914d32e271ef8406b317 100644 (file)
@@ -1220,7 +1220,7 @@ namespace Functions
   
   template <int dim>
   FourierSineSum<dim>::
-  FourierSineSum (const std::vector<Point<dim> > &fourier_coefficients,
+  FourierSineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
                  const std::vector<double>      &weights)
                  :
                  Function<dim> (1),
@@ -1291,12 +1291,12 @@ namespace Functions
   
   template <int dim>
   FourierCosineSum<dim>::
-  FourierCosineSum (const std::vector<Point<dim> > &fourier_coefficients,
-                 const std::vector<double>      &weights)
-                 :
-                 Function<dim> (1),
-    fourier_coefficients (fourier_coefficients),
-    weights (weights)
+  FourierCosineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
+                   const std::vector<double>      &weights)
+                    :
+                    Function<dim> (1),
+                    fourier_coefficients (fourier_coefficients),
+                    weights (weights)
   {
     Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize());
     Assert (fourier_coefficients.size() == weights.size(),
index bd3bbabe9b6241e65b12d16f008eb6f9542a079c..766725c7e69d0cc754bcbd9ec0b39231afb67a5a 100644 (file)
@@ -19,9 +19,9 @@
 // Reserve space for polynomials up to degree 19. Should be sufficient
 // for the start.
 template <typename number>
-std::vector<const std::vector<number>*>
+typename std::vector<const typename std::vector<number> *>
 Legendre<number>::coefficients(20,
-                              static_cast<const std::vector<number>*>(0));
+                              static_cast<const typename std::vector<number>*>(0));
 
 
 // have a lock that guarantees that at most one thread is changing and
@@ -124,7 +124,7 @@ Legendre<number>::compute_coefficients (const unsigned int k_)
 
 
 template <typename number>
-const std::vector<number> &
+const typename std::vector<number> &
 Legendre<number>::get_coefficients (const unsigned int k)
 {
                                   // first make sure the coefficients
index a72a1ed9ab85eb6ff45ab9a469dfaceb50b16d04..6e7dc2a93e4fe5f3d2ba9679d6a0af373cb1038e 100644 (file)
@@ -15,7 +15,7 @@
 #include <base/polynomial.h>
 
 template <typename number>
-Polynomial<number>::Polynomial (const std::vector<number> &a):
+Polynomial<number>::Polynomial (const typename std::vector<number> &a):
                coefficients(a)
 {}
 
@@ -49,7 +49,7 @@ Polynomial<number>::value (const number x) const
 template <typename number>
 void
 Polynomial<number>::value (const number         x,
-                       std::vector<number> &values) const
+                       typename std::vector<number> &values) const
 {
   Assert (coefficients.size() > 0, ExcVoidPolynomial());
   Assert (values.size() > 0, ExcEmptyArray());
index 5d3d772bb4f4bf2566f8f1d03e9786b4c3c4a794..16139048771b067254e5f285923214deb6330093 100644 (file)
@@ -1048,9 +1048,9 @@ class DoFTools
                                      */
     template <int dim>
     static void
-    map_dofs_to_support_points (const Mapping<dim>       &mapping,
-                               const DoFHandler<dim>    &dof_handler,
-                               std::vector<Point<dim> > &support_points);
+    map_dofs_to_support_points (const Mapping<dim>                &mapping,
+                               const DoFHandler<dim>             &dof_handler,
+                               typename std::vector<Point<dim> > &support_points);
 
                                     /**
                                      * This is the opposite function
@@ -1083,7 +1083,7 @@ class DoFTools
     static void
     map_support_points_to_dofs (const Mapping<dim>       &mapping,
                                const DoFHandler<dim>    &dof_handler,
-                               std::map<Point<dim>, unsigned int, Comp> &point_to_index_map);
+                               typename std::map<Point<dim>, unsigned int, Comp> &point_to_index_map);
     
                                     /**
                                      * Exception
@@ -1194,7 +1194,7 @@ void
 DoFTools::
 map_support_points_to_dofs (const Mapping<dim>       &mapping,
                            const DoFHandler<dim>    &dof_handler,
-                           std::map<Point<dim>, unsigned int, Comp> &point_to_index_map)
+                           typename std::map<Point<dim>, unsigned int, Comp> &point_to_index_map)
 {
                                   // let the checking of arguments be
                                   // done by the function first
index a507158cbbf8631de10cb07fe9395d3d50994f30..7ab8e034d1241ed08c9cb8e2ef8a48a58525989e 100644 (file)
@@ -396,7 +396,7 @@ class FiniteElementBase : public Subscriptor,
                                        * entries in lower dimensions
                                        * are missing.
                                        */
-      std::vector<FEValues<dim>*> differences;
+      typename std::vector<FEValues<dim>*> differences;
     };
   
                                     /**
@@ -663,7 +663,8 @@ class FiniteElementBase : public Subscriptor,
                                      * See the class documentation
                                      * for details on support points.
                                      */
-    const std::vector<Point<dim> > & get_unit_support_points () const;    
+    const typename std::vector<Point<dim> > &
+    get_unit_support_points () const;    
 
                                     /**
                                      * Return whether a finite
@@ -731,7 +732,8 @@ class FiniteElementBase : public Subscriptor,
                                      * See the class documentation
                                      * for details on support points.
                                      */
-    const std::vector<Point<dim-1> > & get_unit_face_support_points () const;    
+    const typename std::vector<Point<dim-1> > &
+    get_unit_face_support_points () const;    
 
                                     /**
                                      * Return whether a finite
@@ -948,7 +950,7 @@ class FiniteElementBase : public Subscriptor,
                                      * support points. In that case,
                                      * this field remains empty.
                                      */
-    std::vector<Point<dim> > unit_support_points;
+    typename std::vector<Point<dim> > unit_support_points;
 
                                     /**
                                      * Same for the faces. See the
@@ -958,7 +960,7 @@ class FiniteElementBase : public Subscriptor,
                                      * what contributes a face
                                      * support point.
                                      */
-    std::vector<Point<dim-1> > unit_face_support_points;
+    typename std::vector<Point<dim-1> > unit_face_support_points;
 
                                      /**
                                      * Compute second derivatives by
index 8a89d33ae95660b411bcb559fb528a40a5270520..6d27189e99367cfb42e51b0d79887bc80a438c33 100644 (file)
@@ -317,7 +317,7 @@ class FE_DGQ : public FiniteElement<dim>
                                          * values for each quadrature
                                          * point.
                                          */                                  
-       std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
+       typename std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
                                     /**
index 1a2b78d769c0bd4b5572431eb033855dfb8551ce..107d2462206f071215868698d5e55e05f89117c7 100644 (file)
@@ -629,7 +629,7 @@ class FE_Q : public FiniteElement<dim>
                                          * vector for each shape function, containing
                                          * values for each quadrature point.
                                          */                                  
-       std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
+       typename std::vector<typename std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
                                     /**
index b06266a74b2209a06daec71364d18059562c4e91..b86f235415abee20b96ae87ef3999a3e49153844 100644 (file)
@@ -106,21 +106,21 @@ class FEValuesData
                                      * real element, rather than on the
                                      * reference element.
                                      */
-    std::vector<Point<dim> >  quadrature_points;
+    typename std::vector<Point<dim> >  quadrature_points;
 
                                     /**
                                      * List of outward normal vectors at the
                                      * quadrature points. This field is filled
                                      * in by the finite element class.
                                      */
-    std::vector<Point<dim> >  normal_vectors;
+    typename std::vector<Point<dim> >  normal_vectors;
 
                                      /**
                                      * List of boundary forms at the
                                      * quadrature points. This field is filled
                                      * in by the finite element class.
                                      */
-    std::vector<Tensor<1,dim> >  boundary_forms;
+    typename std::vector<Tensor<1,dim> >  boundary_forms;
 
                                      /**
                                      * Original update flags handed
@@ -793,7 +793,7 @@ class FEFaceValuesBase : public FEValuesBase<dim>
                                      * Return the list of outward normal
                                      * vectors times quadrature weights.
                                      */
-    const std::vector<Tensor<1,dim> > & get_boundary_forms () const;
+    const typename std::vector<Tensor<1,dim> > & get_boundary_forms () const;
 
                                     /**
                                      * Return the present
index 9c2793ab8d2b1f288d90ff88a746f45571c9c7f2..b79cc74587b2229be06f5b56206f0aac5349554a 100644 (file)
@@ -162,10 +162,10 @@ class Mapping : public Subscriptor
                                      * can be given as additional
                                      * argument.
                                      */
-    virtual void transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                                     const std::vector<Tensor<1,dim> > &src,
-                                     const InternalDataBaseinternal,
-                                     const unsigned int src_offset) const = 0;
+    virtual void transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                                     const typename std::vector<Tensor<1,dim> > &src,
+                                     const InternalDataBase                     &internal,
+                                     const unsigned int                          src_offset) const = 0;
     
                                     /**
                                      * Tranform a field of
@@ -178,10 +178,12 @@ class Mapping : public Subscriptor
                                      * can be given as additional
                                      * argument.
                                      */
-    virtual void transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                                         const std::vector<Tensor<1,dim> > &src,
-                                         const InternalDataBase& internal,
-                                         const unsigned int src_offset) const = 0;
+    virtual
+    void
+    transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                            const typename std::vector<Tensor<1,dim> > &src,
+                            const InternalDataBase                     &internal,
+                            const unsigned int                          src_offset) const = 0;
     
                                     /**
                                      * Tranform a field of covariant vectors.
@@ -190,10 +192,12 @@ class Mapping : public Subscriptor
                                      * the first quadrature point can be
                                      * given as additional argument.
                                      */
-    virtual void transform_covariant (std::vector<Point<dim> >       &dst,
-                                     const std::vector<Point<dim> > &src,
-                                     const InternalDataBase& internal,
-                                     const unsigned int src_offset) const = 0;
+    virtual
+    void
+    transform_covariant (typename std::vector<Point<dim> >       &dst,
+                        const typename std::vector<Point<dim> > &src,
+                        const InternalDataBase                  &internal,
+                        const unsigned int                       src_offset) const = 0;
     
                                     /**
                                      * Tranform a field of contravariant vectors.
@@ -202,10 +206,12 @@ class Mapping : public Subscriptor
                                      * the first quadrature point can be
                                      * given as additional argument.
                                      */
-    virtual void transform_contravariant (std::vector<Point<dim> >       &dst,
-                                         const std::vector<Point<dim> > &src,
-                                         const InternalDataBase& internal,
-                                         const unsigned int src_offset) const = 0;
+    virtual
+    void
+    transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                            const typename std::vector<Point<dim> > &src,
+                            const InternalDataBase                  &internal,
+                            const unsigned int                       src_offset) const = 0;
 
                                     /**
                                      * Indicate fields to be updated in the
@@ -315,10 +321,10 @@ class Mapping : public Subscriptor
                                      */
     virtual void
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
-                   const Quadrature<dim>quadrature,
-                   InternalDataBaseinternal,
-                   std::vector<Point<dim> >        &quadrature_points,
-                   std::vector<double>             &JxW_values) const = 0;
+                   const Quadrature<dim>                         &quadrature,
+                   InternalDataBase                              &internal,
+                   typename std::vector<Point<dim> >             &quadrature_points,
+                   std::vector<double>                           &JxW_values) const = 0;
 
                                     /**
                                      * Performs the same as @p{fill_fe_values}
@@ -343,27 +349,27 @@ class Mapping : public Subscriptor
                                      */
     virtual void
     fill_fe_face_values (const typename DoFHandler<dim>::cell_iterator &cell,
-                        const unsigned int face_no,
-                        const Quadrature<dim-1>quadrature,
-                        InternalDataBaseinternal,
-                        std::vector<Point<dim> >        &quadrature_points,
-                        std::vector<double>             &JxW_values,
-                        std::vector<Tensor<1,dim> >        &boundary_form,
-                        std::vector<Point<dim> >        &normal_vectors) const = 0;
+                        const unsigned int                        face_no,
+                        const Quadrature<dim-1>                  &quadrature,
+                        InternalDataBase                         &internal,
+                        typename std::vector<Point<dim> >        &quadrature_points,
+                        std::vector<double>                      &JxW_values,
+                        typename std::vector<Tensor<1,dim> >     &boundary_form,
+                        typename std::vector<Point<dim> >        &normal_vectors) const = 0;
 
                                     /**
                                      * See above.
                                      */
     virtual void
     fill_fe_subface_values (const typename DoFHandler<dim>::cell_iterator &cell,
-                           const unsigned int face_no,
-                           const unsigned int sub_no,
-                           const Quadrature<dim-1>quadrature,
-                           InternalDataBaseinternal,
-                           std::vector<Point<dim> >        &quadrature_points,
-                           std::vector<double>             &JxW_values,
-                           std::vector<Tensor<1,dim> >        &boundary_form,
-                           std::vector<Point<dim> >        &normal_vectors) const = 0;
+                           const unsigned int                        face_no,
+                           const unsigned int                        sub_no,
+                           const Quadrature<dim-1>                  &quadrature,
+                           InternalDataBase                         &internal,
+                           typename std::vector<Point<dim> >        &quadrature_points,
+                           std::vector<double>                      &JxW_values,
+                           typename std::vector<Tensor<1,dim> >     &boundary_form,
+                           typename std::vector<Point<dim> >        &normal_vectors) const = 0;
 
                                     /**
                                      * Give class @p{FEValues} access
index 43534ca29f7752c0fb4d408b642ff0ba15cbafde..1f56596e4e1a5a9791118dcc53fc18f04cc299b1 100644 (file)
@@ -66,7 +66,7 @@ class MappingCartesian : public Mapping<dim>
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>& quadrature,
                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                   std::vector<Point<dim> >        &quadrature_points,
+                   typename std::vector<Point<dim> >        &quadrature_points,
                    std::vector<double>             &JxW_values) const ;
 
                                     /**
@@ -78,10 +78,10 @@ class MappingCartesian : public Mapping<dim>
                         const unsigned int face_no,
                         const Quadrature<dim-1>& quadrature,
                         typename Mapping<dim>::InternalDataBase &mapping_data,
-                        std::vector<Point<dim> >        &quadrature_points,
+                        typename std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>             &JxW_values,
-                        std::vector<Tensor<1,dim> >        &boundary_form,
-                        std::vector<Point<dim> >        &normal_vectors) const ;
+                        typename std::vector<Tensor<1,dim> >        &boundary_form,
+                        typename std::vector<Point<dim> >        &normal_vectors) const ;
 
                                     /**
                                      * Implementation of the interface in
@@ -93,10 +93,10 @@ class MappingCartesian : public Mapping<dim>
                            const unsigned int sub_no,
                            const Quadrature<dim-1>& quadrature,
                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                           std::vector<Point<dim> >        &quadrature_points,
+                           typename std::vector<Point<dim> >        &quadrature_points,
                            std::vector<double>             &JxW_values,
-                           std::vector<Tensor<1,dim> >        &boundary_form,
-                           std::vector<Point<dim> >        &normal_vectors) const ;
+                           typename std::vector<Tensor<1,dim> >        &boundary_form,
+                           typename std::vector<Point<dim> >        &normal_vectors) const ;
 
 
                                     /**
@@ -104,8 +104,8 @@ class MappingCartesian : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                        const std::vector<Tensor<1,dim> > &src,
+    transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                        const typename std::vector<Tensor<1,dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -114,8 +114,8 @@ class MappingCartesian : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                            const std::vector<Tensor<1,dim> > &src,
+    transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                            const typename std::vector<Tensor<1,dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
 
@@ -124,8 +124,8 @@ class MappingCartesian : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Point<dim> >       &dst,
-                        const std::vector<Point<dim> > &src,
+    transform_covariant (typename std::vector<Point<dim> >       &dst,
+                        const typename std::vector<Point<dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -134,8 +134,8 @@ class MappingCartesian : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Point<dim> >       &dst,
-                            const std::vector<Point<dim> > &src,
+    transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                            const typename std::vector<Point<dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
     
@@ -186,8 +186,8 @@ class MappingCartesian : public Mapping<dim>
                                      * covariant transformation.
                                      */
     template <typename tensor_>
-    void covariant_transformation (std::vector<tensor_>       &dst,
-                                  const std::vector<tensor_> &src,
+    void covariant_transformation (typename std::vector<tensor_>       &dst,
+                                  const typename std::vector<tensor_> &src,
                                   const typename Mapping<dim>::InternalDataBase &mapping_data,
                                   const unsigned int src_offset) const;
     
@@ -196,8 +196,8 @@ class MappingCartesian : public Mapping<dim>
                                      * contravariant transformation.
                                      */
     template <typename tensor_>
-    void contravariant_transformation (std::vector<tensor_>       &dst,
-                                      const std::vector<tensor_> &src,
+    void contravariant_transformation (typename std::vector<tensor_>       &dst,
+                                      const typename std::vector<tensor_> &src,
                                       const typename Mapping<dim>::InternalDataBase &mapping_data,
                                       const unsigned int src_offset) const;
 
@@ -234,7 +234,7 @@ class MappingCartesian : public Mapping<dim>
                                          * points. Especially, all
                                          * points of all faces.
                                          */
-       std::vector<Point<dim> > quadrature_points;
+       typename std::vector<Point<dim> > quadrature_points;
        
                                         /**
                                          * Unit tangential vectors. Used
@@ -244,12 +244,12 @@ class MappingCartesian : public Mapping<dim>
                                          *
                                          * Filled once.
                                          */
-        std::vector<std::vector<Tensor<1,dim> > > unit_tangentials;
+        typename std::vector<typename std::vector<Tensor<1,dim> > > unit_tangentials;
        
                                         /**
                                          * Auxiliary vectors for internal use.
                                          */
-        std::vector<std::vector<Tensor<1,dim> > > aux;
+        typename std::vector<typename std::vector<Tensor<1,dim> > > aux;
     };
     
                                     /**
@@ -260,8 +260,8 @@ class MappingCartesian : public Mapping<dim>
                       const unsigned int face_no,
                       const unsigned int sub_no,
                       InternalData& data,
-                      std::vector<Point<dim> > &quadrature_points,
-                      std::vector<Point<dim> >& normal_vectors) const;
+                      typename std::vector<Point<dim> > &quadrature_points,
+                      typename std::vector<Point<dim> >& normal_vectors) const;
 
   private:
                                     /**
index 289f4dcbb711b35f0d1f943bb2fcbd6faecf26e9..0a8d3c7786022c8d3601e48f5b301535a7486d28 100644 (file)
@@ -82,8 +82,8 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                        const std::vector<Tensor<1,dim> > &src,
+    transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                        const typename std::vector<Tensor<1,dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -92,8 +92,8 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                            const std::vector<Tensor<1,dim> > &src,
+    transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                            const typename std::vector<Tensor<1,dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
 
@@ -102,8 +102,8 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Point<dim> >       &dst,
-                        const std::vector<Point<dim> > &src,
+    transform_covariant (typename std::vector<Point<dim> >       &dst,
+                        const typename std::vector<Point<dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -112,8 +112,8 @@ class MappingQ : public MappingQ1<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Point<dim> >       &dst,
-                            const std::vector<Point<dim> > &src,
+    transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                            const typename std::vector<Point<dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
 
@@ -133,7 +133,7 @@ class MappingQ : public MappingQ1<dim>
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                &quadrature,
                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                   std::vector<Point<dim> >             &quadrature_points,
+                   typename std::vector<Point<dim> >             &quadrature_points,
                    std::vector<double>                  &JxW_values) const ;
 
                                     /**
@@ -145,10 +145,10 @@ class MappingQ : public MappingQ1<dim>
                         const unsigned int face_no,
                         const Quadrature<dim-1>& quadrature,
                         typename Mapping<dim>::InternalDataBase &mapping_data,
-                        std::vector<Point<dim> >        &quadrature_points,
+                        typename std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>             &JxW_values,
-                        std::vector<Tensor<1,dim> >        &exterior_form,
-                        std::vector<Point<dim> >        &normal_vectors) const ;
+                        typename std::vector<Tensor<1,dim> >        &exterior_form,
+                        typename std::vector<Point<dim> >        &normal_vectors) const ;
 
                                     /**
                                      * Implementation of the interface in
@@ -160,10 +160,10 @@ class MappingQ : public MappingQ1<dim>
                            const unsigned int sub_no,
                            const Quadrature<dim-1>& quadrature,
                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                           std::vector<Point<dim> >        &quadrature_points,
+                           typename std::vector<Point<dim> >        &quadrature_points,
                            std::vector<double>             &JxW_values,
-                           std::vector<Tensor<1,dim> >        &exterior_form,
-                           std::vector<Point<dim> >        &normal_vectors) const ;
+                           typename std::vector<Tensor<1,dim> >        &exterior_form,
+                           typename std::vector<Point<dim> >        &normal_vectors) const ;
 
                                     /** 
                                      * Storage for internal data of
@@ -197,7 +197,7 @@ class MappingQ : public MappingQ1<dim>
                                          * Filled (hardcoded) once in
                                          * @p{get_face_data}.
                                          */
-        std::vector<std::vector<Point<dim> > > unit_normals;
+        typename std::vector<typename std::vector<Point<dim> > > unit_normals;
 
                                         /**
                                          * Flag that is set by the
@@ -307,7 +307,7 @@ class MappingQ : public MappingQ1<dim>
                                      * derivatives.
                                      */
     virtual void
-    compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
+    compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
                            typename MappingQ1<dim>::InternalData &data) const;
 
                                     /**
@@ -364,7 +364,7 @@ class MappingQ : public MappingQ1<dim>
                                      * points are appended.
                                      */
     void apply_laplace_vector(const std::vector<std::vector<double> > &lvs,
-                             std::vector<Point<dim> > &a) const;
+                             typename std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Computes the support points of
@@ -372,7 +372,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      std::vector<Point<dim> > &a) const;
+      typename std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * Computes all support points of
@@ -390,7 +390,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     void compute_support_points_laplace(
       const typename Triangulation<dim>::cell_iterator &cell,
-      std::vector<Point<dim> > &a) const;
+      typename std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Simple version of the
@@ -414,7 +414,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     void compute_support_points_simple(
       const typename Triangulation<dim>::cell_iterator &cell,
-      std::vector<Point<dim> > &a) const;    
+      typename std::vector<Point<dim> > &a) const;    
     
                                     /**
                                      * For @p{dim=2} and 3. Simple
@@ -427,7 +427,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
 //TODO:[RH] (later) remove this function altogether?    
     void fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &cell,
-                                         std::vector<Point<dim> > &a) const;
+                                         typename std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Needed by the
index 9f267dc62c073e48ff25bf4fc1ca0b967650a39b..d33b4b24d32eaee4bde95e9d70363d29c1017152 100644 (file)
@@ -71,8 +71,8 @@ class MappingQ1 : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                        const std::vector<Tensor<1,dim> > &src,
+    transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                        const typename std::vector<Tensor<1,dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -81,8 +81,8 @@ class MappingQ1 : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                            const std::vector<Tensor<1,dim> > &src,
+    transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                            const typename std::vector<Tensor<1,dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
 
@@ -91,8 +91,8 @@ class MappingQ1 : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_covariant (std::vector<Point<dim> >       &dst,
-                        const std::vector<Point<dim> > &src,
+    transform_covariant (typename std::vector<Point<dim> >       &dst,
+                        const typename std::vector<Point<dim> > &src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data,
                         const unsigned int src_offset) const;
     
@@ -101,8 +101,8 @@ class MappingQ1 : public Mapping<dim>
                                      * @ref{Mapping}.
                                      */
     virtual void
-    transform_contravariant (std::vector<Point<dim> >       &dst,
-                            const std::vector<Point<dim> > &src,
+    transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                            const typename std::vector<Point<dim> > &src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data,
                             const unsigned int src_offset) const;
     
@@ -129,7 +129,7 @@ class MappingQ1 : public Mapping<dim>
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>& quadrature,
                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                   std::vector<Point<dim> >        &quadrature_points,
+                   typename std::vector<Point<dim> >       &quadrature_points,
                    std::vector<double>             &JxW_values) const ;
 
                                     /**
@@ -141,10 +141,10 @@ class MappingQ1 : public Mapping<dim>
                         const unsigned int face_no,
                         const Quadrature<dim-1>& quadrature,
                         typename Mapping<dim>::InternalDataBase &mapping_data,
-                        std::vector<Point<dim> >        &quadrature_points,
+                        typename std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>             &JxW_values,
-                        std::vector<Tensor<1,dim> >        &boundary_form,
-                        std::vector<Point<dim> >        &normal_vectors) const ;
+                        typename std::vector<Tensor<1,dim> >        &boundary_form,
+                        typename std::vector<Point<dim> >        &normal_vectors) const ;
 
                                     /**
                                      * Implementation of the interface in
@@ -156,18 +156,18 @@ class MappingQ1 : public Mapping<dim>
                            const unsigned int sub_no,
                            const Quadrature<dim-1>& quadrature,
                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                           std::vector<Point<dim> >        &quadrature_points,
+                           typename std::vector<Point<dim> >        &quadrature_points,
                            std::vector<double>             &JxW_values,
-                           std::vector<Tensor<1,dim> >        &boundary_form,
-                           std::vector<Point<dim> >        &normal_vectors) const ;
+                           typename std::vector<Tensor<1,dim> >        &boundary_form,
+                           typename std::vector<Point<dim> >        &normal_vectors) const ;
     
                                     /**
                                      * Implementation of the
                                      * covariant transformation.
                                      */
     template <typename tensor_>
-    void covariant_transformation (std::vector<tensor_>       &dst,
-                                  const std::vector<tensor_> &src,
+    void covariant_transformation (typename std::vector<tensor_>       &dst,
+                                  const typename std::vector<tensor_> &src,
                                   const typename Mapping<dim>::InternalDataBase &mapping_data,
                                   const unsigned int src_offset) const;
     
@@ -176,8 +176,8 @@ class MappingQ1 : public Mapping<dim>
                                      * contravariant transformation.
                                      */
     template <typename tensor_>
-    void contravariant_transformation (std::vector<tensor_>       &dst,
-                                      const std::vector<tensor_> &src,
+    void contravariant_transformation (typename std::vector<tensor_>       &dst,
+                                      const typename std::vector<tensor_> &src,
                                       const typename Mapping<dim>::InternalDataBase &mapping_data,
                                       const unsigned int src_offset) const;
 
@@ -251,7 +251,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed once.
                                          */
-       std::vector<Tensor<1,dim> > shape_derivatives;
+       typename std::vector<Tensor<1,dim> > shape_derivatives;
        
                                         /**
                                          * Tensors of covariant
@@ -259,7 +259,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed on each cell.
                                          */
-       std::vector<Tensor<2,dim> > covariant;
+       typename std::vector<Tensor<2,dim> > covariant;
        
                                         /**
                                          * Tensors of covariant
@@ -267,7 +267,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed on each cell.
                                          */
-       std::vector<Tensor<2,dim> > contravariant;
+       typename std::vector<Tensor<2,dim> > contravariant;
        
                                         /**
                                          * Unit tangential vectors. Used
@@ -277,19 +277,19 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Filled once.
                                          */
-        std::vector<std::vector<Tensor<1,dim> > > unit_tangentials;
+        typename std::vector<typename std::vector<Tensor<1,dim> > > unit_tangentials;
        
                                         /**
                                          * Auxuliary vectors for internal use.
                                          */
-        std::vector<std::vector<Tensor<1,dim> > > aux;
+        typename std::vector<typename std::vector<Tensor<1,dim> > > aux;
 
                                         /**
                                          * Stores the support points of
                                          * the mapping shape functions on
                                          * the @p{cell_of_current_support_points}.
                                          */
-       std::vector<Point<dim> > mapping_support_points;
+       typename std::vector<Point<dim> > mapping_support_points;
        
                                         /**
                                          * Stores the cell of which the
@@ -335,7 +335,7 @@ class MappingQ1 : public Mapping<dim>
                                      * @p{data.is_mapping_q1_data}
                                      * equals @p{true} or @p{false}.
                                      */
-    void compute_shapes (const std::vector<Point<dim> > &unit_points,
+    void compute_shapes (const typename std::vector<Point<dim> > &unit_points,
                         InternalData &data) const;
 
                                     /**
@@ -347,9 +347,9 @@ class MappingQ1 : public Mapping<dim>
                                      * and shape values are computed.
                                      */
     void compute_data (const UpdateFlags flags,
-                      const Quadrature<dim>quadrature,
+                      const Quadrature<dim> &quadrature,
                       const unsigned int n_orig_q_points,
-                      InternalDatadata) const;
+                      InternalData &data) const;
 
                                     /**
                                      * Do the computations for the
@@ -376,7 +376,7 @@ class MappingQ1 : public Mapping<dim>
                       const unsigned int   npts,
                       const unsigned int   offset,
                       InternalData        &data,
-                      std::vector<Point<dim> > &quadrature_points) const;
+                      typename std::vector<Point<dim> > &quadrature_points) const;
     
                                     /**
                                      * Do the computation for the
@@ -389,16 +389,16 @@ class MappingQ1 : public Mapping<dim>
                            const unsigned int      offset,
                            const std::vector<double>   &weights,
                            InternalData           &mapping_data,
-                           std::vector<Point<dim> >    &quadrature_points,
+                           typename std::vector<Point<dim> >    &quadrature_points,
                            std::vector<double>         &JxW_values,
-                           std::vector<Tensor<1,dim> > &boundary_form,
-                           std::vector<Point<dim> > &normal_vectors) const;
+                           typename std::vector<Tensor<1,dim> > &boundary_form,
+                           typename std::vector<Point<dim> > &normal_vectors) const;
     
                                     /**
                                      * Compute shape values and/or
                                      * derivatives.
                                      */
-    virtual void compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
+    virtual void compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
                                         InternalData &data) const;
 
                                     /**
@@ -511,7 +511,7 @@ class MappingQ1 : public Mapping<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      std::vector<Point<dim> > &a) const;
+      typename std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * Number of shape functions. Is
index c9b24d0ae6c4e6b43c7c22b6177bf624ce2cda93..d57a5cb52c2fd295216d6885ef9599376968ec15 100644 (file)
@@ -143,7 +143,7 @@ class MappingQ1Eulerian : public MappingQ1<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      std::vector<Point<dim> > &a) const;
+      typename std::vector<Point<dim> > &a) const;
     
 };
 
index b8e16f279818d32b117a9da4da5fbf5599ffaeb0..ed134402b1e4e899a30de5c6cf8d923879a08115 100644 (file)
@@ -451,7 +451,7 @@ class GridGenerator
                                      */
     template <int dim>
     static void laplace_transformation (Triangulation<dim> &tria,
-                                       const std::map<unsigned int,Point<dim> > &new_points);
+                                       const typename std::map<unsigned int,Point<dim> > &new_points);
 
                                     /**
                                      * Declaration of same function
index 538b62eb08051aa2d5bf84cc8b7961127eb7e58d..db7c0edaad30725518ee2521cbddd12f8e4ba337 100644 (file)
@@ -2873,7 +2873,7 @@ class Triangulation : public TriaDimensionInfo<dim>,
                                      * function
                                      * @ref{get_used_vertices}.
                                      */
-    const std::vector<Point<dim> > &
+    const typename std::vector<Point<dim> > &
     get_vertices () const;
     
                                     /**
index 1affbe1e4acd21bfdcdad5e3f08cce41f8c09560..367fdb0599a3111730f1dfb2f8c0efddb4886c50 100644 (file)
@@ -903,7 +903,8 @@ int TriaObjectAccessor<celldim,dim>::child_index (const unsigned int i) const
 template<int celldim, int dim>
 bool TriaObjectAccessor<celldim,dim>::has_children () const
 {
-  Assert (state() == valid, ExcDereferenceInvalidObject());
+  Assert (state() == valid,
+         typename TriaAccessor<dim>::ExcDereferenceInvalidObject());
   return (tria->levels[present_level]->hexes.children[present_index] != -1);
 };
 
index 43165280d2101fb6a5c160ffc1bc0e1b973431d9..94ee043e2661c81d9e527b62ed56e0b660dbcad3 100644 (file)
@@ -373,7 +373,7 @@ template <>
 void
 StraightBoundary<1>::
 get_normals_at_vertices (const Triangulation<1>::face_iterator &,
-                        FaceVertexNormals &) const;
+                        Boundary<1>::FaceVertexNormals &) const;
 template <>
 void
 StraightBoundary<2>::
index 247d1c7285d308caa44aa6b7dd5fcd77684fd922..8e6528ee22a1990bfa75d6a3e888e3be606f1d98 100644 (file)
@@ -377,7 +377,7 @@ template <>
 void
 HyperBallBoundary<1>::
 get_normals_at_vertices (const Triangulation<1>::face_iterator &,
-                        FaceVertexNormals &) const;
+                        Boundary<1>::FaceVertexNormals &) const;
 template <>
 Point<1>
 HalfHyperBallBoundary<1>::
index 8b4e358e8ed00da06e565597f7608a403962c581..128e126a51d052efc676194e2b756ac211313d2e 100644 (file)
@@ -434,7 +434,7 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      * Abbreviate the somewhat lengthy
                                      * name for the @p{Patch} class.
                                      */
-    typedef DataOutBase::Patch<patch_dim,patch_space_dim> Patch;
+    typedef typename DataOutBase::Patch<patch_dim,patch_space_dim> Patch;
 
                                     /**
                                      * Pointer to the dof handler object.
index 23e53e69c3d6ba759f3c648ef3c1c6c790812e1a..661a37eaca60361ad474e6caf69b1af50a1ecc75 100644 (file)
@@ -411,7 +411,7 @@ class SolutionTransfer
                                      * of all cells that'll be coarsened
                                      * will be stored in this vector.
                                      */
-    typename std::vector<std::vector<Vector<number> > > dof_values_on_cell;
+    typename std::vector<typename std::vector<Vector<number> > > dof_values_on_cell;
 };
 
 
index 4f6370191364825167be3b546c623ff956d3c329..95ebbaceb258c5af834da5664ad4ce71290de38f 100644 (file)
@@ -1573,9 +1573,9 @@ class TimeStepBase_Tria : public TimeStepBase
                                      * @ref{TimeStepBase_Tria_Flags}
                                      * namespace into local scope.
                                      */
-    typedef TimeStepBase_Tria_Flags::Flags<dim>           Flags;
-    typedef TimeStepBase_Tria_Flags::RefinementFlags<dim> RefinementFlags;
-    typedef TimeStepBase_Tria_Flags::RefinementData<dim>  RefinementData;
+    typedef typename TimeStepBase_Tria_Flags::Flags<dim>           Flags;
+    typedef typename TimeStepBase_Tria_Flags::RefinementFlags<dim> RefinementFlags;
+    typedef typename TimeStepBase_Tria_Flags::RefinementData<dim>  RefinementData;
     
     
                                     /**
index 0b6abd6c7079a293119895d771de617ff61ff195..29b164b48017c315377c351d857043b6ca80ab83 100644 (file)
@@ -2164,7 +2164,7 @@ template <int dim>
 void
 DoFTools::map_dofs_to_support_points (const Mapping<dim>       &mapping,
                                      const DoFHandler<dim>    &dof_handler,
-                                     std::vector<Point<dim> > &support_points)
+                                     typename std::vector<Point<dim> > &support_points)
 {
   const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell;
   
index f3d88928142e5ed3e2d7a83b451a95a7c00a284e..3d08499824da8867b881f9311e9af50f34a15b9c 100644 (file)
@@ -254,7 +254,7 @@ bool FiniteElementBase<dim>::operator == (const FiniteElementBase<dim> &f) const
 
 
 template <int dim>
-const std::vector<Point<dim> > &
+const typename std::vector<Point<dim> > &
 FiniteElementBase<dim>::get_unit_support_points () const
 {
                                   // a finite element may define
@@ -279,7 +279,7 @@ FiniteElementBase<dim>::has_support_points () const
 
 
 template <int dim>
-const std::vector<Point<dim-1> > &
+const typename std::vector<Point<dim-1> > &
 FiniteElementBase<dim>::get_unit_face_support_points () const
 {
                                   // a finite element may define
index bb9be8f047d07ff54bc86e938e1dcd1aa034e462..408d6b3bddbc1b631facdddef6321768abd114c4 100644 (file)
@@ -603,7 +603,7 @@ FEFaceValuesBase<dim>::FEFaceValuesBase (const unsigned int n_q_points,
 
 
 template <int dim>
-const std::vector<Point<dim> > &
+const typename std::vector<Point<dim> > &
 FEFaceValuesBase<dim>::get_normal_vectors () const
 {
   Assert (update_flags & update_normal_vectors,
@@ -614,7 +614,7 @@ FEFaceValuesBase<dim>::get_normal_vectors () const
 
 
 template <int dim>
-const std::vector<Tensor<1,dim> > &
+const typename std::vector<Tensor<1,dim> > &
 FEFaceValuesBase<dim>::get_boundary_forms () const
 {
   Assert (update_flags & update_boundary_forms,
index ba4c63635cf9ce41b7ccf7e90b165ccf0231ddeb..c6c67241f1277883f2b1fce0ac5ef15906769051 100644 (file)
@@ -135,8 +135,8 @@ MappingCartesian<dim>::compute_fill (const typename DoFHandler<dim>::cell_iterat
                                     const unsigned int        face_no,
                                     const unsigned int        sub_no,
                                     InternalData             &data,
-                                    std::vector<Point<dim> > &quadrature_points,
-                                    std::vector<Point<dim> > &normal_vectors) const
+                                    typename std::vector<Point<dim> > &quadrature_points,
+                                    typename std::vector<Point<dim> > &normal_vectors) const
 {
   UpdateFlags update_flags(data.current_update_flags());
 
@@ -278,7 +278,7 @@ void
 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,
+                                      typename std::vector<Point<dim> >& quadrature_points,
                                       std::vector<double>& JxW_values) const
 {
                                   // convert data object to internal
@@ -317,10 +317,10 @@ MappingCartesian<dim>::fill_fe_face_values (const typename DoFHandler<dim>::cell
                                            const unsigned int            face_no,
                                            const Quadrature<dim-1>      &q,
                                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                                           std::vector<Point<dim> >     &quadrature_points,
+                                           typename std::vector<Point<dim> >     &quadrature_points,
                                            std::vector<double>          &JxW_values,
-                                           std::vector<Tensor<1,dim> >  &boundary_forms,
-                                           std::vector<Point<dim> >     &normal_vectors) const
+                                           typename std::vector<Tensor<1,dim> >  &boundary_forms,
+                                           typename std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -363,10 +363,10 @@ MappingCartesian<dim>::fill_fe_subface_values (const typename DoFHandler<dim>::c
                                        const unsigned int       sub_no,
                                        const Quadrature<dim-1> &q,
                                        typename Mapping<dim>::InternalDataBase &mapping_data,
-                                       std::vector<Point<dim> >     &quadrature_points,
+                                       typename std::vector<Point<dim> >     &quadrature_points,
                                        std::vector<double>          &JxW_values,
-                                       std::vector<Tensor<1,dim> >  &boundary_forms,
-                                       std::vector<Point<dim> >     &normal_vectors) const
+                                       typename std::vector<Tensor<1,dim> >  &boundary_forms,
+                                       typename std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -438,8 +438,8 @@ MappingCartesian<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterator
 
 template <int dim>
 void
-MappingCartesian<dim>::transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                                           const std::vector<Tensor<1,dim> > &src,
+MappingCartesian<dim>::transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                                           const typename std::vector<Tensor<1,dim> > &src,
                                            const typename Mapping<dim>::InternalDataBase &mapping_data,
                                            const unsigned int src_offset) const
 {
@@ -449,8 +449,8 @@ MappingCartesian<dim>::transform_covariant (std::vector<Tensor<1,dim> >       &d
 
 template <int dim>
 void
-MappingCartesian<dim>::transform_covariant (std::vector<Point<dim> >       &dst,
-                                           const std::vector<Point<dim> > &src,
+MappingCartesian<dim>::transform_covariant (typename std::vector<Point<dim> >       &dst,
+                                           const typename std::vector<Point<dim> > &src,
                                            const typename Mapping<dim>::InternalDataBase &mapping_data,
                                            const unsigned int src_offset) const
 {
@@ -459,8 +459,8 @@ MappingCartesian<dim>::transform_covariant (std::vector<Point<dim> >       &dst,
 
 template <int dim>
 void
-MappingCartesian<dim>::transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                                               const std::vector<Tensor<1,dim> > &src,
+MappingCartesian<dim>::transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                                               const typename std::vector<Tensor<1,dim> > &src,
                                                const typename Mapping<dim>::InternalDataBase &mapping_data,
                                                const unsigned int src_offset) const
 {
@@ -471,8 +471,8 @@ MappingCartesian<dim>::transform_contravariant (std::vector<Tensor<1,dim> >
 
 template <int dim>
 void
-MappingCartesian<dim>::transform_contravariant (std::vector<Point<dim> >       &dst,
-                                               const std::vector<Point<dim> > &src,
+MappingCartesian<dim>::transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                                               const typename std::vector<Point<dim> > &src,
                                                const typename Mapping<dim>::InternalDataBase &mapping_data,
                                                const unsigned int src_offset) const
 {
@@ -550,10 +550,11 @@ template <int dim>
 template <typename tensor_>
 inline
 void
-MappingCartesian<dim>::contravariant_transformation (std::vector<tensor_>       &dst,
-                                                    const std::vector<tensor_> &src,
-                                                    const typename Mapping<dim>::InternalDataBase &mapping_data,
-                                                    const unsigned int src_offset) const
+MappingCartesian<dim>::
+contravariant_transformation (typename std::vector<tensor_>       &dst,
+                             const typename std::vector<tensor_> &src,
+                             const typename Mapping<dim>::InternalDataBase &mapping_data,
+                             const unsigned int src_offset) const
 {
   Assert(tensor_::dimension==dim && tensor_::rank==1, ExcInvalidData());
 
@@ -587,10 +588,11 @@ template <int dim>
 template <typename tensor_>
 inline
 void
-MappingCartesian<dim>::covariant_transformation (std::vector<tensor_>       &dst,
-                                                const std::vector<tensor_> &src,
-                                                const typename Mapping<dim>::InternalDataBase &mapping_data,
-                                                const unsigned int src_offset) const
+MappingCartesian<dim>::
+covariant_transformation (typename std::vector<tensor_>       &dst,
+                         const typename std::vector<tensor_> &src,
+                         const typename Mapping<dim>::InternalDataBase &mapping_data,
+                         const unsigned int src_offset) const
 {
   Assert(tensor_::dimension==dim && tensor_::rank==1, ExcInvalidData());
 
index 191fe3f182ac82f8eff625fdad4bb21605a241a6..37bfe641b574403d3e7dd568ea8a9f660869885f 100644 (file)
@@ -166,7 +166,7 @@ MappingQ<1>::compute_shapes_virtual (const std::vector<Point<1> > &unit_points,
 
 template<int dim>
 void
-MappingQ<dim>::compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
+MappingQ<dim>::compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
                                       typename MappingQ1<dim>::InternalData &data) const
 {
   const unsigned int n_points=unit_points.size();
@@ -263,7 +263,7 @@ void
 MappingQ<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,
+                              typename std::vector<Point<dim> >             &quadrature_points,
                               std::vector<double>                  &JxW_values) const
 {
                                   // convert data object to internal
@@ -301,10 +301,10 @@ MappingQ<dim>::fill_fe_face_values (const typename DoFHandler<dim>::cell_iterato
                                    const unsigned int       face_no,
                                    const Quadrature<dim-1> &q,
                                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                                   std::vector<Point<dim> >     &quadrature_points,
+                                   typename std::vector<Point<dim> >     &quadrature_points,
                                    std::vector<double>          &JxW_values,
-                                   std::vector<Tensor<1,dim> >  &exterior_forms,
-                                   std::vector<Point<dim> >     &normal_vectors) const
+                                   typename std::vector<Tensor<1,dim> >  &exterior_forms,
+                                   typename std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -356,10 +356,10 @@ MappingQ<dim>::fill_fe_subface_values (const typename DoFHandler<dim>::cell_iter
                                       const unsigned int       sub_no,
                                       const Quadrature<dim-1> &q,
                                       typename Mapping<dim>::InternalDataBase &mapping_data,
-                                      std::vector<Point<dim> >     &quadrature_points,
+                                      typename std::vector<Point<dim> >     &quadrature_points,
                                       std::vector<double>          &JxW_values,
-                                      std::vector<Tensor<1,dim> >  &exterior_forms,
-                                      std::vector<Point<dim> >     &normal_vectors) const
+                                      typename std::vector<Tensor<1,dim> >  &exterior_forms,
+                                      typename std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -649,7 +649,7 @@ MappingQ<dim>::compute_laplace_vector(std::vector<std::vector<double> > &lvs) co
 template <int dim>
 void
 MappingQ<dim>::apply_laplace_vector(const std::vector<std::vector<double> > &lvs,
-                                   std::vector<Point<dim> > &a) const
+                                   typename std::vector<Point<dim> > &a) const
 {
   Assert(lvs.size()!=0, ExcLaplaceVectorNotSet(degree));
   const unsigned int n_inner_apply=lvs.size();
@@ -680,7 +680,7 @@ template <int dim>
 void
 MappingQ<dim>::compute_mapping_support_points(
   const typename Triangulation<dim>::cell_iterator &cell,
-  std::vector<Point<dim> > &a) const
+  typename std::vector<Point<dim> > &a) const
 {
                                   // if this is a cell for which we
                                   // want to compute the full
@@ -712,7 +712,7 @@ MappingQ<dim>::compute_mapping_support_points(
 template <int dim>
 void
 MappingQ<dim>::compute_support_points_laplace(const typename Triangulation<dim>::cell_iterator &cell,
-                                             std::vector<Point<dim> > &a) const
+                                             typename std::vector<Point<dim> > &a) const
 {
                                   // in any case, we need the
                                   // vertices first
@@ -754,7 +754,7 @@ MappingQ<dim>::compute_support_points_laplace(const typename Triangulation<dim>:
 template <int dim>
 void
 MappingQ<dim>::compute_support_points_simple(const typename Triangulation<dim>::cell_iterator &cell,
-                                            std::vector<Point<dim> > &a) const
+                                            typename std::vector<Point<dim> > &a) const
 {
   Assert(a.size()==0, ExcInternalError());
                                   // the vertices first
@@ -851,7 +851,7 @@ MappingQ<1>::add_line_support_points (const Triangulation<1>::cell_iterator &,
 template <int dim>
 void
 MappingQ<dim>::add_line_support_points (const typename Triangulation<dim>::cell_iterator &cell,
-                                       std::vector<Point<dim> > &a) const
+                                       typename std::vector<Point<dim> > &a) const
 {
   static const StraightBoundary<dim> straight_boundary;
                                   // if we only need the midpoint,
@@ -1041,7 +1041,7 @@ MappingQ<3>::add_quad_support_points(const Triangulation<3>::cell_iterator &cell
 template<int dim>
 void
 MappingQ<dim>::add_quad_support_points(const typename Triangulation<dim>::cell_iterator &,
-                                      std::vector<Point<dim> > &) const
+                                      typename std::vector<Point<dim> > &) const
 {
   Assert (dim > 2, ExcImpossibleInDim(dim));
 }
@@ -1080,14 +1080,14 @@ MappingQ<3>::fill_quad_support_points_simple (const Triangulation<3>::cell_itera
 template <int dim>
 void
 MappingQ<dim>::fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &,
-                                               std::vector<Point<dim> > &) const
+                                               typename std::vector<Point<dim> > &) const
 {}
 
 
 template <int dim>
 void
-MappingQ<dim>::transform_covariant (std::vector<Tensor<1,dim> >       &dst,
-                                   const std::vector<Tensor<1,dim> > &src,
+MappingQ<dim>::transform_covariant (typename std::vector<Tensor<1,dim> >       &dst,
+                                   const typename std::vector<Tensor<1,dim> > &src,
                                    const typename Mapping<dim>::InternalDataBase &mapping_data,
                                    const unsigned int src_offset) const
 {
@@ -1114,8 +1114,8 @@ MappingQ<dim>::transform_covariant (std::vector<Tensor<1,dim> >       &dst,
 
 template <int dim>
 void
-MappingQ<dim>::transform_covariant (std::vector<Point<dim> >       &dst,
-                                   const std::vector<Point<dim> > &src,
+MappingQ<dim>::transform_covariant (typename std::vector<Point<dim> >       &dst,
+                                   const typename std::vector<Point<dim> > &src,
                                    const typename Mapping<dim>::InternalDataBase &mapping_data,
                                    const unsigned int src_offset) const
 {
@@ -1142,8 +1142,8 @@ MappingQ<dim>::transform_covariant (std::vector<Point<dim> >       &dst,
 
 template <int dim>
 void
-MappingQ<dim>::transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
-                                       const std::vector<Tensor<1,dim> > &src,
+MappingQ<dim>::transform_contravariant (typename std::vector<Tensor<1,dim> >       &dst,
+                                       const typename std::vector<Tensor<1,dim> > &src,
                                        const typename Mapping<dim>::InternalDataBase &mapping_data,
                                        const unsigned int src_offset) const
 {
@@ -1170,8 +1170,8 @@ MappingQ<dim>::transform_contravariant (std::vector<Tensor<1,dim> >       &dst,
 
 template <int dim>
 void
-MappingQ<dim>::transform_contravariant (std::vector<Point<dim> >       &dst,
-                                       const std::vector<Point<dim> > &src,
+MappingQ<dim>::transform_contravariant (typename std::vector<Point<dim> >       &dst,
+                                       const typename std::vector<Point<dim> > &src,
                                        const typename Mapping<dim>::InternalDataBase &mapping_data,
                                        const unsigned int src_offset) const
 {
index 2df84da7fe2c97de2cf029bdf84ed162a2cd0958..b4e32950dcced8c9167eb59783bfbe2166bbb2f6 100644 (file)
@@ -35,7 +35,7 @@ template <int dim>
 void
 MappingQ1Eulerian<dim>::compute_mapping_support_points(
   const typename Triangulation<dim>::cell_iterator &cell,
-  std::vector<Point<dim> > &a) const
+  typename std::vector<Point<dim> > &a) const
 {
 
                                   // The assertions can not be in the
index 1d809861794c6762899f6cb93cd9bdccf07c6008..04eb18181f99cb71b7cfc2da491e7ac740a526d5 100644 (file)
@@ -738,7 +738,7 @@ void GridGenerator::laplace_transformation (Triangulation<1> &,
 
 template <int dim>
 void GridGenerator::laplace_transformation (Triangulation<dim> &tria,
-                                           const std::map<unsigned int,Point<dim> > &new_points)
+                                           const typename std::map<unsigned int,Point<dim> > &new_points)
 {
                                   // first provide everything that is
                                   // needed for solving a Laplace
index 65f397fa3e3727b98039c3190759b8c61e4d79e3..646d67b77ef790fb1109a8f027841ed860245ed6 100644 (file)
@@ -109,10 +109,10 @@ GridReordering<2>::Cell::insert_faces (std::map<Face,FaceData> &global_faces)
                                   // defined by the order of vertices
                                   // in the cell object
   Face new_faces[GeometryInfo<dim>::faces_per_cell]
-    = { { {vertices[0], vertices[1]} },
-        { {vertices[1], vertices[2]} },
-       { {vertices[3], vertices[2]} },
-       { {vertices[0], vertices[3]} } };
+    = { { { vertices[0], vertices[1] } },
+        { { vertices[1], vertices[2] } },
+       { { vertices[3], vertices[2] } },
+       { { vertices[0], vertices[3] } } };
 
                                   // then insert them into the global
                                   // list and store iterators to
index 99f21cf5bc895e51aa35ba40e778a418c3bcc68d..26b07f2c05cdcf0c61d095be253c1d3db0ddf0ec 100644 (file)
@@ -3691,7 +3691,7 @@ Triangulation<dim>::n_vertices () const
 
 
 template <int dim>
-const std::vector<Point<dim> > &
+const typename std::vector<Point<dim> > &
 Triangulation<dim>::get_vertices () const 
 {
   return vertices;
index a105f51cc0f560ecaa743d35e8ff4c30a732c16a..c1c548281d1e9985287ab19ed6cf166c99b54e14 100644 (file)
@@ -1551,7 +1551,7 @@ bool CellAccessor<1>::at_boundary () const
 template <>
 unsigned char CellAccessor<1>::material_id () const
 {
-  Assert (used(), ExcCellNotUsed());
+  Assert (used(), TriaAccessor<1>::ExcCellNotUsed());
   return tria->levels[present_level]->lines.material_id[present_index];
 };
 
@@ -1560,7 +1560,7 @@ unsigned char CellAccessor<1>::material_id () const
 template <>
 void CellAccessor<1>::set_material_id (const unsigned char mat_id) const
 {
-  Assert (used(), ExcCellNotUsed());
+  Assert (used(), TriaAccessor<1>::ExcCellNotUsed());
   tria->levels[present_level]->lines.material_id[present_index]
     = mat_id;                                           
 };
@@ -1676,7 +1676,7 @@ bool CellAccessor<3>::at_boundary () const
 template <>
 unsigned char CellAccessor<3>::material_id () const
 {
-  Assert (used(), ExcCellNotUsed());
+  Assert (used(), TriaAccessor<3>::ExcCellNotUsed());
   return tria->levels[present_level]->hexes.material_id[present_index];
 };
 
@@ -1685,7 +1685,7 @@ unsigned char CellAccessor<3>::material_id () const
 template <>
 void CellAccessor<3>::set_material_id (const unsigned char mat_id) const
 {
-  Assert (used(), ExcCellNotUsed());
+  Assert (used(), TriaAccessor<3>::ExcCellNotUsed());
   tria->levels[present_level]->hexes.material_id[present_index]
     = mat_id;                                           
 };
index 421a7c561d336c3f437c2025cd1689703e730fec..4503806d2dd738b13e06aecb11afa72fd1da0360 100644 (file)
@@ -44,7 +44,7 @@ template <int dim>
 void
 Boundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &,
-                                std::vector<Point<dim> > &) const
+                                typename std::vector<Point<dim> > &) const
 {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
@@ -55,7 +55,7 @@ template <int dim>
 void
 Boundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &,
-                                std::vector<Point<dim> > &) const
+                                typename std::vector<Point<dim> > &) const
 {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
@@ -211,7 +211,7 @@ template <>
 void
 StraightBoundary<1>::
 get_normals_at_vertices (const Triangulation<1>::face_iterator &,
-                        FaceVertexNormals &) const
+                        Boundary<1>::FaceVertexNormals &) const
 {
   Assert (false, Boundary<1>::ExcFunctionNotUseful(1));
 };
index 5431ac6058c4aa27cf1289901915331abf093752..27b39a1f43fe2193e7df0ddf5c6f7a6f748ae1d6 100644 (file)
@@ -249,7 +249,7 @@ template <>
 void
 HyperBallBoundary<1>::
 get_normals_at_vertices (const Triangulation<1>::face_iterator &,
-                        FaceVertexNormals &) const
+                        Boundary<1>::FaceVertexNormals &) const
 {
   Assert (false, Boundary<1>::ExcFunctionNotUseful(1));
 };
index 091819f838a57425082b6224e9c8ba1ad063f48f..d38a34e1bf8e4322adacdbc0c563f1c1fd952ee8 100644 (file)
@@ -828,7 +828,7 @@ void TimeStepBase_Tria<dim>::refine_grid (const RefinementData refinement_data)
                                         // (there are more coming below then
                                         // also)
        if (refinement_flags.adapt_grids)
-         adapt_grids (*previous_tria, *tria);
+         adapt_grids<dim> (*previous_tria, *tria);
        
                                         // perform flagging of cells
                                         // needed to regularize the
@@ -1085,7 +1085,7 @@ void TimeStepBase_Tria<dim>::refine_grid (const RefinementData refinement_data)
                                       // strange things may happen
       if (refinement_flags.mirror_flags_to_previous_grid)
        {
-         adapt_grids (*previous_tria, *tria);
+         adapt_grids<dim> (*previous_tria, *tria);
 
          typename Triangulation<dim>::cell_iterator old_cell, new_cell, endc;
          old_cell = previous_tria->begin(0);
@@ -1103,7 +1103,7 @@ void TimeStepBase_Tria<dim>::refine_grid (const RefinementData refinement_data)
                                       // cells to avoid the previous grid
                                       // to have cells refined twice more
                                       // than the present one and vica versa.
-      adapt_grids (*previous_tria, *tria);
+      adapt_grids<dim> (*previous_tria, *tria);
     };
 };
 
@@ -1159,7 +1159,7 @@ TimeStepBase_Tria_Flags::Flags<dim>::Flags (const bool delete_and_rebuild_tria,
 
 
 template <int dim>
-TimeStepBase_Tria_Flags::RefinementFlags<dim>::CorrectionRelaxations
+typename TimeStepBase_Tria_Flags::RefinementFlags<dim>::CorrectionRelaxations
 TimeStepBase_Tria_Flags::RefinementFlags<dim>::default_correction_relaxations 
   (1,    // one element, denoting the first and all subsequent sweeps
    std::vector<std::pair<unsigned int,double> >(1,    // one element, denoting the upper bound
index bc43eb0b1b82af7cc5f81926d374e3526dd9b422..98cc8987aadb862038eb063226389739d0cd6b75 100644 (file)
@@ -536,7 +536,7 @@ class BlockSparseMatrix : public Subscriptor
                                     /**
                                      * Array of sub-matrices.
                                      */
-    typename std::vector<std::vector<SmartPointer<SparseMatrix<number> > > > sub_objects;
+    typename std::vector<typename std::vector<SmartPointer<SparseMatrix<number> > > > sub_objects;
 };
 
 
index d7480cd448986ba2639ac802cde18b4c4512ecd1..34e71fb401cad5b3d33a25f0a5b6a389c62e41dd 100644 (file)
@@ -347,7 +347,7 @@ class BlockSparsityPatternBase : public Subscriptor
                                     /**
                                      * Array of sparsity patterns.
                                      */
-    std::vector<std::vector<SmartPointer<SparsityPatternBase> > > sub_objects;
+    typename std::vector<typename std::vector<SmartPointer<SparsityPatternBase> > > sub_objects;
 
                                     /**
                                      * Object storing and managing
@@ -534,7 +534,7 @@ template <class SparsityPatternBase>
 inline
 void
 BlockSparsityPatternBase<SparsityPatternBase>::add (const unsigned int i,
-                                               const unsigned int j)
+                                                   const unsigned int j)
 {
                                   // if you get an error here, are
                                   // you sure you called
index 95ade6b7fb660cd7732b211aaeab5513f99d3fe7..03f4287ff7252ae3983d4341018d81e28731fc2c 100644 (file)
@@ -487,7 +487,7 @@ class FilteredMatrix : public Subscriptor
                                      * the value to which it shall be
                                      * fixed.
                                      */
-    std::vector<IndexValuePair> constraints;
+    typename std::vector<IndexValuePair> constraints;
 
                                     /**
                                      * Vector to be used as temporary
@@ -556,7 +556,7 @@ class FilteredMatrix : public Subscriptor
                                      * matrix types.
                                      */
     void get_column_entries (const unsigned int           index,
-                            std::vector<IndexValuePair> &column_entries,
+                            typename std::vector<IndexValuePair> &column_entries,
                             const bool                   matrix_is_symmetric) const;
 };
 
index 2940dbf3fcb907aca0fcce41bfda5f7e5fdaf486..7643878babe769f32f6ff5dbb57bf2b188253b6e 100644 (file)
@@ -898,7 +898,7 @@ class SparsityPattern : public Subscriptor
                                      */
     template <typename value>
     unsigned int
-    get_column_index_from_iterator (const std::pair<unsigned int, value> &i);
+    get_column_index_from_iterator (const typename std::pair<unsigned int, value> &i);
 
                                     /**
                                      * Likewise, but sometimes needed
@@ -909,7 +909,7 @@ class SparsityPattern : public Subscriptor
                                      */
     template <typename value>
     unsigned int
-    get_column_index_from_iterator (const std::pair<const unsigned int, value> &i);
+    get_column_index_from_iterator (const typename std::pair<const unsigned int, value> &i);
     
                                     /**
                                      * Make all sparse matrices
@@ -1099,7 +1099,7 @@ SparsityPattern::get_column_index_from_iterator (const unsigned int i)
 template <typename value>
 inline
 unsigned int
-SparsityPattern::get_column_index_from_iterator (const std::pair<unsigned int, value> &i)
+SparsityPattern::get_column_index_from_iterator (const typename std::pair<unsigned int, value> &i)
 {
   return i.first;
 };
@@ -1109,7 +1109,7 @@ SparsityPattern::get_column_index_from_iterator (const std::pair<unsigned int, v
 template <typename value>
 inline
 unsigned int
-SparsityPattern::get_column_index_from_iterator (const std::pair<const unsigned int, value> &i)
+SparsityPattern::get_column_index_from_iterator (const typename std::pair<const unsigned int, value> &i)
 {
   return i.first;
 };

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.