From 168d8304e61bc1916e7b95c77dc00b7525419b65 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 25 Sep 2001 14:17:32 +0000 Subject: [PATCH] Add a large number of 'typename's to make the IBM xlC compiler more happy. It doesn't grok the library anyway, but it's more standards conformant this way. git-svn-id: https://svn.dealii.org/branches/Branch-3-2@5060 0785d39b-7218-0410-832d-ea1e28bc413d --- .../base/include/base/function_derivative.h | 2 +- deal.II/base/include/base/function_lib.h | 8 +- deal.II/base/include/base/polynomial.h | 12 +-- .../include/base/tensor_product_polynomials.h | 6 +- deal.II/base/include/base/thread_management.h | 2 +- .../base/source/auto_derivative_function.cc | 8 +- deal.II/base/source/function.cc | 2 +- deal.II/base/source/function_derivative.cc | 2 +- deal.II/base/source/function_lib.cc | 14 ++-- deal.II/base/source/legendre.cc | 6 +- deal.II/base/source/polynomial.cc | 4 +- deal.II/deal.II/include/dofs/dof_tools.h | 10 +-- deal.II/deal.II/include/fe/fe_base.h | 12 +-- deal.II/deal.II/include/fe/fe_dgq.h | 2 +- deal.II/deal.II/include/fe/fe_q.h | 2 +- deal.II/deal.II/include/fe/fe_values.h | 8 +- deal.II/deal.II/include/fe/mapping.h | 76 ++++++++++--------- .../deal.II/include/fe/mapping_cartesian.h | 48 ++++++------ deal.II/deal.II/include/fe/mapping_q.h | 44 +++++------ deal.II/deal.II/include/fe/mapping_q1.h | 68 ++++++++--------- .../deal.II/include/fe/mapping_q1_eulerian.h | 2 +- deal.II/deal.II/include/grid/grid_generator.h | 2 +- deal.II/deal.II/include/grid/tria.h | 2 +- .../include/grid/tria_accessor.templates.h | 3 +- deal.II/deal.II/include/grid/tria_boundary.h | 2 +- .../deal.II/include/grid/tria_boundary_lib.h | 2 +- deal.II/deal.II/include/numerics/data_out.h | 2 +- .../include/numerics/solution_transfer.h | 2 +- .../deal.II/include/numerics/time_dependent.h | 6 +- deal.II/deal.II/source/dofs/dof_tools.cc | 2 +- deal.II/deal.II/source/fe/fe.cc | 4 +- deal.II/deal.II/source/fe/fe_values.cc | 4 +- .../deal.II/source/fe/mapping_cartesian.cc | 52 +++++++------ deal.II/deal.II/source/fe/mapping_q.cc | 46 +++++------ .../deal.II/source/fe/mapping_q1_eulerian.cc | 2 +- deal.II/deal.II/source/grid/grid_generator.cc | 2 +- .../deal.II/source/grid/grid_reordering.cc | 8 +- deal.II/deal.II/source/grid/tria.cc | 2 +- deal.II/deal.II/source/grid/tria_accessor.cc | 8 +- deal.II/deal.II/source/grid/tria_boundary.cc | 6 +- .../deal.II/source/grid/tria_boundary_lib.cc | 2 +- .../deal.II/source/numerics/time_dependent.cc | 8 +- deal.II/lac/include/lac/block_sparse_matrix.h | 2 +- .../lac/include/lac/block_sparsity_pattern.h | 4 +- deal.II/lac/include/lac/filtered_matrix.h | 4 +- deal.II/lac/include/lac/sparsity_pattern.h | 8 +- 46 files changed, 268 insertions(+), 255 deletions(-) diff --git a/deal.II/base/include/base/function_derivative.h b/deal.II/base/include/base/function_derivative.h index d6fe25eb70..c2c1788e73 100644 --- a/deal.II/base/include/base/function_derivative.h +++ b/deal.II/base/include/base/function_derivative.h @@ -80,7 +80,7 @@ class FunctionDerivative : public Function * values are accessed. */ FunctionDerivative (const Function &f, - const std::vector > &direction, + const typename std::vector > &direction, const double h = 1.e-6); /** diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index 11214eaa2f..3371177c1c 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -671,7 +671,7 @@ namespace Functions * coefficients in each space * direction as argument. */ - FourierSineSum (const std::vector > &fourier_coefficients, + FourierSineSum (const typename std::vector > &fourier_coefficients, const std::vector &weights); /** @@ -713,7 +713,7 @@ namespace Functions * Stored Fourier coefficients * and weights. */ - const std::vector > fourier_coefficients; + const typename std::vector > fourier_coefficients; const std::vector weights; }; @@ -737,7 +737,7 @@ namespace Functions * coefficients in each space * direction as argument. */ - FourierCosineSum (const std::vector > &fourier_coefficients, + FourierCosineSum (const typename std::vector > &fourier_coefficients, const std::vector &weights); /** @@ -779,7 +779,7 @@ namespace Functions * Stored Fourier coefficients * and weights. */ - const std::vector > fourier_coefficients; + const typename std::vector > fourier_coefficients; const std::vector weights; }; diff --git a/deal.II/base/include/base/polynomial.h b/deal.II/base/include/base/polynomial.h index 3d364e07c0..94ea8aa0bb 100644 --- a/deal.II/base/include/base/polynomial.h +++ b/deal.II/base/include/base/polynomial.h @@ -49,7 +49,7 @@ class Polynomial : public Subscriptor * the @p{coefficient} array * minus one. */ - Polynomial (const std::vector &coefficients); + Polynomial (const typename std::vector &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 &values) const; + void value (const number x, + typename std::vector &values) const; /** * Degree of the polynomial. This @@ -116,7 +116,7 @@ class Polynomial : public Subscriptor * passed down by derived * classes. */ - std::vector coefficients; + typename std::vector coefficients; }; @@ -205,7 +205,7 @@ class Legendre : public Polynomial * vectors in order to simplify * programming multithread-safe. */ - static std::vector*> coefficients; + static typename std::vector *> coefficients; /** * Compute coefficients recursively. @@ -219,7 +219,7 @@ class Legendre : public Polynomial * constructor of * @ref{Polynomial}. */ - static const std::vector & + static const typename std::vector & get_coefficients (const unsigned int k); }; diff --git a/deal.II/base/include/base/tensor_product_polynomials.h b/deal.II/base/include/base/tensor_product_polynomials.h index dcdace986e..d6f4a29acd 100644 --- a/deal.II/base/include/base/tensor_product_polynomials.h +++ b/deal.II/base/include/base/tensor_product_polynomials.h @@ -43,8 +43,8 @@ class TensorProductPolynomials * and will be copied into the * member variable @p{polynomials}. */ - template - TensorProductPolynomials(const std::vector &pols); + template + TensorProductPolynomials(const typename std::vector &pols); /** * Computes the value and the @@ -210,7 +210,7 @@ class TensorProductPolynomials template template TensorProductPolynomials::TensorProductPolynomials( - const std::vector &pols): + const typename std::vector &pols): polynomials (pols.begin(), pols.end()), n_tensor_pols(power(pols.size(), dim)), n_pols_to(dim+1) diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index dacd9ac5f7..a3ccbd5d1c 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -5471,7 +5471,7 @@ namespace Threads template - typename std::vector > + typename std::vector > split_range (const ForwardIterator &begin, const ForwardIterator &end, const unsigned int n_intervals) diff --git a/deal.II/base/source/auto_derivative_function.cc b/deal.II/base/source/auto_derivative_function.cc index 59de4c29e1..f4a770f825 100644 --- a/deal.II/base/source/auto_derivative_function.cc +++ b/deal.II/base/source/auto_derivative_function.cc @@ -242,8 +242,10 @@ void AutoDerivativeFunction::gradient_list (const typename std::vector -void AutoDerivativeFunction::vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const +void +AutoDerivativeFunction:: +vector_gradient_list (const typename std::vector > &points, + typename std::vector > > &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); @@ -303,7 +305,7 @@ void AutoDerivativeFunction::vector_gradient_list (const typename std::vect template -AutoDerivativeFunction::DifferenceFormula +typename AutoDerivativeFunction::DifferenceFormula AutoDerivativeFunction::get_formula_of_order(const unsigned int ord) { switch (ord) diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index adfda47a1a..3fecfc8ea4 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -116,7 +116,7 @@ void Function::gradient_list (const typename std::vector > &poin template void Function::vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const + typename std::vector > > &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); diff --git a/deal.II/base/source/function_derivative.cc b/deal.II/base/source/function_derivative.cc index 5b7f940164..30fb387ce1 100644 --- a/deal.II/base/source/function_derivative.cc +++ b/deal.II/base/source/function_derivative.cc @@ -34,7 +34,7 @@ FunctionDerivative::FunctionDerivative (const Function &f, template FunctionDerivative::FunctionDerivative (const Function& f, - const std::vector >& dir, + const typename std::vector >& dir, const double h) : Function (f.n_components, f.get_time()), diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 3ce089862b..52af839617 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -1220,7 +1220,7 @@ namespace Functions template FourierSineSum:: - FourierSineSum (const std::vector > &fourier_coefficients, + FourierSineSum (const typename std::vector > &fourier_coefficients, const std::vector &weights) : Function (1), @@ -1291,12 +1291,12 @@ namespace Functions template FourierCosineSum:: - FourierCosineSum (const std::vector > &fourier_coefficients, - const std::vector &weights) - : - Function (1), - fourier_coefficients (fourier_coefficients), - weights (weights) + FourierCosineSum (const typename std::vector > &fourier_coefficients, + const std::vector &weights) + : + Function (1), + fourier_coefficients (fourier_coefficients), + weights (weights) { Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); Assert (fourier_coefficients.size() == weights.size(), diff --git a/deal.II/base/source/legendre.cc b/deal.II/base/source/legendre.cc index bd3bbabe9b..766725c7e6 100644 --- a/deal.II/base/source/legendre.cc +++ b/deal.II/base/source/legendre.cc @@ -19,9 +19,9 @@ // Reserve space for polynomials up to degree 19. Should be sufficient // for the start. template -std::vector*> +typename std::vector *> Legendre::coefficients(20, - static_cast*>(0)); + static_cast*>(0)); // have a lock that guarantees that at most one thread is changing and @@ -124,7 +124,7 @@ Legendre::compute_coefficients (const unsigned int k_) template -const std::vector & +const typename std::vector & Legendre::get_coefficients (const unsigned int k) { // first make sure the coefficients diff --git a/deal.II/base/source/polynomial.cc b/deal.II/base/source/polynomial.cc index a72a1ed9ab..6e7dc2a93e 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -15,7 +15,7 @@ #include template -Polynomial::Polynomial (const std::vector &a): +Polynomial::Polynomial (const typename std::vector &a): coefficients(a) {} @@ -49,7 +49,7 @@ Polynomial::value (const number x) const template void Polynomial::value (const number x, - std::vector &values) const + typename std::vector &values) const { Assert (coefficients.size() > 0, ExcVoidPolynomial()); Assert (values.size() > 0, ExcEmptyArray()); diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 1ff0234e7d..f0b882d536 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1047,9 +1047,9 @@ class DoFTools */ template static void - map_dofs_to_support_points (const Mapping &mapping, - const DoFHandler &dof_handler, - std::vector > &support_points); + map_dofs_to_support_points (const Mapping &mapping, + const DoFHandler &dof_handler, + typename std::vector > &support_points); /** * This is the opposite function @@ -1082,7 +1082,7 @@ class DoFTools static void map_support_points_to_dofs (const Mapping &mapping, const DoFHandler &dof_handler, - std::map, unsigned int, Comp> &point_to_index_map); + typename std::map, unsigned int, Comp> &point_to_index_map); /** * Exception @@ -1193,7 +1193,7 @@ void DoFTools:: map_support_points_to_dofs (const Mapping &mapping, const DoFHandler &dof_handler, - std::map, unsigned int, Comp> &point_to_index_map) + typename std::map, unsigned int, Comp> &point_to_index_map) { // let the checking of arguments be // done by the function first diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index a507158cbb..7ab8e034d1 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -396,7 +396,7 @@ class FiniteElementBase : public Subscriptor, * entries in lower dimensions * are missing. */ - std::vector*> differences; + typename std::vector*> differences; }; /** @@ -663,7 +663,8 @@ class FiniteElementBase : public Subscriptor, * See the class documentation * for details on support points. */ - const std::vector > & get_unit_support_points () const; + const typename std::vector > & + 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 > & get_unit_face_support_points () const; + const typename std::vector > & + 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 > unit_support_points; + typename std::vector > 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 > unit_face_support_points; + typename std::vector > unit_face_support_points; /** * Compute second derivatives by diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index 8a89d33ae9..6d27189e99 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -317,7 +317,7 @@ class FE_DGQ : public FiniteElement * values for each quadrature * point. */ - std::vector > > shape_gradients; + typename std::vector > > shape_gradients; }; /** diff --git a/deal.II/deal.II/include/fe/fe_q.h b/deal.II/deal.II/include/fe/fe_q.h index 1a2b78d769..107d246220 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -629,7 +629,7 @@ class FE_Q : public FiniteElement * vector for each shape function, containing * values for each quadrature point. */ - std::vector > > shape_gradients; + typename std::vector > > shape_gradients; }; /** diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index b06266a74b..b86f235415 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -106,21 +106,21 @@ class FEValuesData * real element, rather than on the * reference element. */ - std::vector > quadrature_points; + typename std::vector > quadrature_points; /** * List of outward normal vectors at the * quadrature points. This field is filled * in by the finite element class. */ - std::vector > normal_vectors; + typename std::vector > normal_vectors; /** * List of boundary forms at the * quadrature points. This field is filled * in by the finite element class. */ - std::vector > boundary_forms; + typename std::vector > boundary_forms; /** * Original update flags handed @@ -793,7 +793,7 @@ class FEFaceValuesBase : public FEValuesBase * Return the list of outward normal * vectors times quadrature weights. */ - const std::vector > & get_boundary_forms () const; + const typename std::vector > & get_boundary_forms () const; /** * Return the present diff --git a/deal.II/deal.II/include/fe/mapping.h b/deal.II/deal.II/include/fe/mapping.h index 9c2793ab8d..b79cc74587 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -162,10 +162,10 @@ class Mapping : public Subscriptor * can be given as additional * argument. */ - virtual void transform_covariant (std::vector > &dst, - const std::vector > &src, - const InternalDataBase& internal, - const unsigned int src_offset) const = 0; + virtual void transform_covariant (typename std::vector > &dst, + const typename std::vector > &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 > &dst, - const std::vector > &src, - const InternalDataBase& internal, - const unsigned int src_offset) const = 0; + virtual + void + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &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 > &dst, - const std::vector > &src, - const InternalDataBase& internal, - const unsigned int src_offset) const = 0; + virtual + void + transform_covariant (typename std::vector > &dst, + const typename std::vector > &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 > &dst, - const std::vector > &src, - const InternalDataBase& internal, - const unsigned int src_offset) const = 0; + virtual + void + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &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::cell_iterator &cell, - const Quadrature& quadrature, - InternalDataBase& internal, - std::vector > &quadrature_points, - std::vector &JxW_values) const = 0; + const Quadrature &quadrature, + InternalDataBase &internal, + typename std::vector > &quadrature_points, + std::vector &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::cell_iterator &cell, - const unsigned int face_no, - const Quadrature& quadrature, - InternalDataBase& internal, - std::vector > &quadrature_points, - std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const = 0; + const unsigned int face_no, + const Quadrature &quadrature, + InternalDataBase &internal, + typename std::vector > &quadrature_points, + std::vector &JxW_values, + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const = 0; /** * See above. */ virtual void fill_fe_subface_values (const typename DoFHandler::cell_iterator &cell, - const unsigned int face_no, - const unsigned int sub_no, - const Quadrature& quadrature, - InternalDataBase& internal, - std::vector > &quadrature_points, - std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const = 0; + const unsigned int face_no, + const unsigned int sub_no, + const Quadrature &quadrature, + InternalDataBase &internal, + typename std::vector > &quadrature_points, + std::vector &JxW_values, + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const = 0; /** * Give class @p{FEValues} access diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 43534ca29f..1f56596e4e 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -66,7 +66,7 @@ class MappingCartesian : public Mapping fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values) const ; /** @@ -78,10 +78,10 @@ class MappingCartesian : public Mapping const unsigned int face_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const ; + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const ; /** * Implementation of the interface in @@ -93,10 +93,10 @@ class MappingCartesian : public Mapping const unsigned int sub_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const ; + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const ; /** @@ -104,8 +104,8 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -114,8 +114,8 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -124,8 +124,8 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -134,8 +134,8 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -186,8 +186,8 @@ class MappingCartesian : public Mapping * covariant transformation. */ template - void covariant_transformation (std::vector &dst, - const std::vector &src, + void covariant_transformation (typename std::vector &dst, + const typename std::vector &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -196,8 +196,8 @@ class MappingCartesian : public Mapping * contravariant transformation. */ template - void contravariant_transformation (std::vector &dst, - const std::vector &src, + void contravariant_transformation (typename std::vector &dst, + const typename std::vector &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -234,7 +234,7 @@ class MappingCartesian : public Mapping * points. Especially, all * points of all faces. */ - std::vector > quadrature_points; + typename std::vector > quadrature_points; /** * Unit tangential vectors. Used @@ -244,12 +244,12 @@ class MappingCartesian : public Mapping * * Filled once. */ - std::vector > > unit_tangentials; + typename std::vector > > unit_tangentials; /** * Auxiliary vectors for internal use. */ - std::vector > > aux; + typename std::vector > > aux; }; /** @@ -260,8 +260,8 @@ class MappingCartesian : public Mapping const unsigned int face_no, const unsigned int sub_no, InternalData& data, - std::vector > &quadrature_points, - std::vector >& normal_vectors) const; + typename std::vector > &quadrature_points, + typename std::vector >& normal_vectors) const; private: /** diff --git a/deal.II/deal.II/include/fe/mapping_q.h b/deal.II/deal.II/include/fe/mapping_q.h index 289f4dcbb7..0a8d3c7786 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -82,8 +82,8 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -92,8 +92,8 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -102,8 +102,8 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -112,8 +112,8 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -133,7 +133,7 @@ class MappingQ : public MappingQ1 fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values) const ; /** @@ -145,10 +145,10 @@ class MappingQ : public MappingQ1 const unsigned int face_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &exterior_form, - std::vector > &normal_vectors) const ; + typename std::vector > &exterior_form, + typename std::vector > &normal_vectors) const ; /** * Implementation of the interface in @@ -160,10 +160,10 @@ class MappingQ : public MappingQ1 const unsigned int sub_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &exterior_form, - std::vector > &normal_vectors) const ; + typename std::vector > &exterior_form, + typename std::vector > &normal_vectors) const ; /** * Storage for internal data of @@ -197,7 +197,7 @@ class MappingQ : public MappingQ1 * Filled (hardcoded) once in * @p{get_face_data}. */ - std::vector > > unit_normals; + typename std::vector > > unit_normals; /** * Flag that is set by the @@ -307,7 +307,7 @@ class MappingQ : public MappingQ1 * derivatives. */ virtual void - compute_shapes_virtual (const std::vector > &unit_points, + compute_shapes_virtual (const typename std::vector > &unit_points, typename MappingQ1::InternalData &data) const; /** @@ -364,7 +364,7 @@ class MappingQ : public MappingQ1 * points are appended. */ void apply_laplace_vector(const std::vector > &lvs, - std::vector > &a) const; + typename std::vector > &a) const; /** * Computes the support points of @@ -372,7 +372,7 @@ class MappingQ : public MappingQ1 */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; /** * Computes all support points of @@ -390,7 +390,7 @@ class MappingQ : public MappingQ1 */ void compute_support_points_laplace( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; /** * Simple version of the @@ -414,7 +414,7 @@ class MappingQ : public MappingQ1 */ void compute_support_points_simple( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; /** * For @p{dim=2} and 3. Simple @@ -427,7 +427,7 @@ class MappingQ : public MappingQ1 */ //TODO:[RH] (later) remove this function altogether? void fill_quad_support_points_simple (const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; /** * Needed by the diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index 9f267dc62c..d33b4b24d3 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -71,8 +71,8 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -81,8 +81,8 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -91,8 +91,8 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (std::vector > &dst, - const std::vector > &src, + transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -101,8 +101,8 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (std::vector > &dst, - const std::vector > &src, + transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -129,7 +129,7 @@ class MappingQ1 : public Mapping fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values) const ; /** @@ -141,10 +141,10 @@ class MappingQ1 : public Mapping const unsigned int face_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const ; + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const ; /** * Implementation of the interface in @@ -156,18 +156,18 @@ class MappingQ1 : public Mapping const unsigned int sub_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const ; + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const ; /** * Implementation of the * covariant transformation. */ template - void covariant_transformation (std::vector &dst, - const std::vector &src, + void covariant_transformation (typename std::vector &dst, + const typename std::vector &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -176,8 +176,8 @@ class MappingQ1 : public Mapping * contravariant transformation. */ template - void contravariant_transformation (std::vector &dst, - const std::vector &src, + void contravariant_transformation (typename std::vector &dst, + const typename std::vector &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const; @@ -251,7 +251,7 @@ class MappingQ1 : public Mapping * * Computed once. */ - std::vector > shape_derivatives; + typename std::vector > shape_derivatives; /** * Tensors of covariant @@ -259,7 +259,7 @@ class MappingQ1 : public Mapping * * Computed on each cell. */ - std::vector > covariant; + typename std::vector > covariant; /** * Tensors of covariant @@ -267,7 +267,7 @@ class MappingQ1 : public Mapping * * Computed on each cell. */ - std::vector > contravariant; + typename std::vector > contravariant; /** * Unit tangential vectors. Used @@ -277,19 +277,19 @@ class MappingQ1 : public Mapping * * Filled once. */ - std::vector > > unit_tangentials; + typename std::vector > > unit_tangentials; /** * Auxuliary vectors for internal use. */ - std::vector > > aux; + typename std::vector > > aux; /** * Stores the support points of * the mapping shape functions on * the @p{cell_of_current_support_points}. */ - std::vector > mapping_support_points; + typename std::vector > mapping_support_points; /** * Stores the cell of which the @@ -335,7 +335,7 @@ class MappingQ1 : public Mapping * @p{data.is_mapping_q1_data} * equals @p{true} or @p{false}. */ - void compute_shapes (const std::vector > &unit_points, + void compute_shapes (const typename std::vector > &unit_points, InternalData &data) const; /** @@ -347,9 +347,9 @@ class MappingQ1 : public Mapping * and shape values are computed. */ void compute_data (const UpdateFlags flags, - const Quadrature& quadrature, + const Quadrature &quadrature, const unsigned int n_orig_q_points, - InternalData& data) const; + InternalData &data) const; /** * Do the computations for the @@ -376,7 +376,7 @@ class MappingQ1 : public Mapping const unsigned int npts, const unsigned int offset, InternalData &data, - std::vector > &quadrature_points) const; + typename std::vector > &quadrature_points) const; /** * Do the computation for the @@ -389,16 +389,16 @@ class MappingQ1 : public Mapping const unsigned int offset, const std::vector &weights, InternalData &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_form, - std::vector > &normal_vectors) const; + typename std::vector > &boundary_form, + typename std::vector > &normal_vectors) const; /** * Compute shape values and/or * derivatives. */ - virtual void compute_shapes_virtual (const std::vector > &unit_points, + virtual void compute_shapes_virtual (const typename std::vector > &unit_points, InternalData &data) const; /** @@ -511,7 +511,7 @@ class MappingQ1 : public Mapping */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; /** * Number of shape functions. Is diff --git a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h index c9b24d0ae6..d57a5cb52c 100644 --- a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h @@ -143,7 +143,7 @@ class MappingQ1Eulerian : public MappingQ1 */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + typename std::vector > &a) const; }; diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h index b8e16f2798..ed134402b1 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -451,7 +451,7 @@ class GridGenerator */ template static void laplace_transformation (Triangulation &tria, - const std::map > &new_points); + const typename std::map > &new_points); /** * Declaration of same function diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index 538b62eb08..db7c0edaad 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -2873,7 +2873,7 @@ class Triangulation : public TriaDimensionInfo, * function * @ref{get_used_vertices}. */ - const std::vector > & + const typename std::vector > & get_vertices () const; /** diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index 1affbe1e4a..367fdb0599 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -903,7 +903,8 @@ int TriaObjectAccessor::child_index (const unsigned int i) const template bool TriaObjectAccessor::has_children () const { - Assert (state() == valid, ExcDereferenceInvalidObject()); + Assert (state() == valid, + typename TriaAccessor::ExcDereferenceInvalidObject()); return (tria->levels[present_level]->hexes.children[present_index] != -1); }; diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 43165280d2..94ee043e26 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -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>:: diff --git a/deal.II/deal.II/include/grid/tria_boundary_lib.h b/deal.II/deal.II/include/grid/tria_boundary_lib.h index 247d1c7285..8e6528ee22 100644 --- a/deal.II/deal.II/include/grid/tria_boundary_lib.h +++ b/deal.II/deal.II/include/grid/tria_boundary_lib.h @@ -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>:: diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 8b4e358e8e..128e126a51 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -434,7 +434,7 @@ class DataOut_DoFData : public DataOutInterface * Abbreviate the somewhat lengthy * name for the @p{Patch} class. */ - typedef DataOutBase::Patch Patch; + typedef typename DataOutBase::Patch Patch; /** * Pointer to the dof handler object. diff --git a/deal.II/deal.II/include/numerics/solution_transfer.h b/deal.II/deal.II/include/numerics/solution_transfer.h index 23e53e69c3..661a37eaca 100644 --- a/deal.II/deal.II/include/numerics/solution_transfer.h +++ b/deal.II/deal.II/include/numerics/solution_transfer.h @@ -411,7 +411,7 @@ class SolutionTransfer * of all cells that'll be coarsened * will be stored in this vector. */ - typename std::vector > > dof_values_on_cell; + typename std::vector > > dof_values_on_cell; }; diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index 4f63701913..95ebbaceb2 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -1573,9 +1573,9 @@ class TimeStepBase_Tria : public TimeStepBase * @ref{TimeStepBase_Tria_Flags} * namespace into local scope. */ - typedef TimeStepBase_Tria_Flags::Flags Flags; - typedef TimeStepBase_Tria_Flags::RefinementFlags RefinementFlags; - typedef TimeStepBase_Tria_Flags::RefinementData RefinementData; + typedef typename TimeStepBase_Tria_Flags::Flags Flags; + typedef typename TimeStepBase_Tria_Flags::RefinementFlags RefinementFlags; + typedef typename TimeStepBase_Tria_Flags::RefinementData RefinementData; /** diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 39714dfd4f..7f27e20917 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -2163,7 +2163,7 @@ template void DoFTools::map_dofs_to_support_points (const Mapping &mapping, const DoFHandler &dof_handler, - std::vector > &support_points) + typename std::vector > &support_points) { const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell; diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index f3d8892814..3d08499824 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -254,7 +254,7 @@ bool FiniteElementBase::operator == (const FiniteElementBase &f) const template -const std::vector > & +const typename std::vector > & FiniteElementBase::get_unit_support_points () const { // a finite element may define @@ -279,7 +279,7 @@ FiniteElementBase::has_support_points () const template -const std::vector > & +const typename std::vector > & FiniteElementBase::get_unit_face_support_points () const { // a finite element may define diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index bb9be8f047..408d6b3bdd 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -603,7 +603,7 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, template -const std::vector > & +const typename std::vector > & FEFaceValuesBase::get_normal_vectors () const { Assert (update_flags & update_normal_vectors, @@ -614,7 +614,7 @@ FEFaceValuesBase::get_normal_vectors () const template -const std::vector > & +const typename std::vector > & FEFaceValuesBase::get_boundary_forms () const { Assert (update_flags & update_boundary_forms, diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index ba4c63635c..c6c67241f1 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -135,8 +135,8 @@ MappingCartesian::compute_fill (const typename DoFHandler::cell_iterat const unsigned int face_no, const unsigned int sub_no, InternalData &data, - std::vector > &quadrature_points, - std::vector > &normal_vectors) const + typename std::vector > &quadrature_points, + typename std::vector > &normal_vectors) const { UpdateFlags update_flags(data.current_update_flags()); @@ -278,7 +278,7 @@ void MappingCartesian::fill_fe_values (const typename DoFHandler::cell_iterator& cell, const Quadrature& q, typename Mapping::InternalDataBase& mapping_data, - std::vector >& quadrature_points, + typename std::vector >& quadrature_points, std::vector& JxW_values) const { // convert data object to internal @@ -317,10 +317,10 @@ MappingCartesian::fill_fe_face_values (const typename DoFHandler::cell const unsigned int face_no, const Quadrature &q, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_forms, - std::vector > &normal_vectors) const + typename std::vector > &boundary_forms, + typename std::vector > &normal_vectors) const { // convert data object to internal // data for this class. fails with @@ -363,10 +363,10 @@ MappingCartesian::fill_fe_subface_values (const typename DoFHandler::c const unsigned int sub_no, const Quadrature &q, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &boundary_forms, - std::vector > &normal_vectors) const + typename std::vector > &boundary_forms, + typename std::vector > &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 void -MappingCartesian::transform_covariant (std::vector > &dst, - const std::vector > &src, +MappingCartesian::transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -449,8 +449,8 @@ MappingCartesian::transform_covariant (std::vector > &d template void -MappingCartesian::transform_covariant (std::vector > &dst, - const std::vector > &src, +MappingCartesian::transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -459,8 +459,8 @@ MappingCartesian::transform_covariant (std::vector > &dst, template void -MappingCartesian::transform_contravariant (std::vector > &dst, - const std::vector > &src, +MappingCartesian::transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -471,8 +471,8 @@ MappingCartesian::transform_contravariant (std::vector > template void -MappingCartesian::transform_contravariant (std::vector > &dst, - const std::vector > &src, +MappingCartesian::transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -550,10 +550,11 @@ template template inline void -MappingCartesian::contravariant_transformation (std::vector &dst, - const std::vector &src, - const typename Mapping::InternalDataBase &mapping_data, - const unsigned int src_offset) const +MappingCartesian:: +contravariant_transformation (typename std::vector &dst, + const typename std::vector &src, + const typename Mapping::InternalDataBase &mapping_data, + const unsigned int src_offset) const { Assert(tensor_::dimension==dim && tensor_::rank==1, ExcInvalidData()); @@ -587,10 +588,11 @@ template template inline void -MappingCartesian::covariant_transformation (std::vector &dst, - const std::vector &src, - const typename Mapping::InternalDataBase &mapping_data, - const unsigned int src_offset) const +MappingCartesian:: +covariant_transformation (typename std::vector &dst, + const typename std::vector &src, + const typename Mapping::InternalDataBase &mapping_data, + const unsigned int src_offset) const { Assert(tensor_::dimension==dim && tensor_::rank==1, ExcInvalidData()); diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 191fe3f182..37bfe641b5 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -166,7 +166,7 @@ MappingQ<1>::compute_shapes_virtual (const std::vector > &unit_points, template void -MappingQ::compute_shapes_virtual (const std::vector > &unit_points, +MappingQ::compute_shapes_virtual (const typename std::vector > &unit_points, typename MappingQ1::InternalData &data) const { const unsigned int n_points=unit_points.size(); @@ -263,7 +263,7 @@ void MappingQ::fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &q, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values) const { // convert data object to internal @@ -301,10 +301,10 @@ MappingQ::fill_fe_face_values (const typename DoFHandler::cell_iterato const unsigned int face_no, const Quadrature &q, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &exterior_forms, - std::vector > &normal_vectors) const + typename std::vector > &exterior_forms, + typename std::vector > &normal_vectors) const { // convert data object to internal // data for this class. fails with @@ -356,10 +356,10 @@ MappingQ::fill_fe_subface_values (const typename DoFHandler::cell_iter const unsigned int sub_no, const Quadrature &q, typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, + typename std::vector > &quadrature_points, std::vector &JxW_values, - std::vector > &exterior_forms, - std::vector > &normal_vectors) const + typename std::vector > &exterior_forms, + typename std::vector > &normal_vectors) const { // convert data object to internal // data for this class. fails with @@ -649,7 +649,7 @@ MappingQ::compute_laplace_vector(std::vector > &lvs) co template void MappingQ::apply_laplace_vector(const std::vector > &lvs, - std::vector > &a) const + typename std::vector > &a) const { Assert(lvs.size()!=0, ExcLaplaceVectorNotSet(degree)); const unsigned int n_inner_apply=lvs.size(); @@ -680,7 +680,7 @@ template void MappingQ::compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const + typename std::vector > &a) const { // if this is a cell for which we // want to compute the full @@ -712,7 +712,7 @@ MappingQ::compute_mapping_support_points( template void MappingQ::compute_support_points_laplace(const typename Triangulation::cell_iterator &cell, - std::vector > &a) const + typename std::vector > &a) const { // in any case, we need the // vertices first @@ -754,7 +754,7 @@ MappingQ::compute_support_points_laplace(const typename Triangulation: template void MappingQ::compute_support_points_simple(const typename Triangulation::cell_iterator &cell, - std::vector > &a) const + typename std::vector > &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 void MappingQ::add_line_support_points (const typename Triangulation::cell_iterator &cell, - std::vector > &a) const + typename std::vector > &a) const { static const StraightBoundary 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 void MappingQ::add_quad_support_points(const typename Triangulation::cell_iterator &, - std::vector > &) const + typename std::vector > &) const { Assert (dim > 2, ExcImpossibleInDim(dim)); } @@ -1080,14 +1080,14 @@ MappingQ<3>::fill_quad_support_points_simple (const Triangulation<3>::cell_itera template void MappingQ::fill_quad_support_points_simple (const typename Triangulation::cell_iterator &, - std::vector > &) const + typename std::vector > &) const {} template void -MappingQ::transform_covariant (std::vector > &dst, - const std::vector > &src, +MappingQ::transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -1114,8 +1114,8 @@ MappingQ::transform_covariant (std::vector > &dst, template void -MappingQ::transform_covariant (std::vector > &dst, - const std::vector > &src, +MappingQ::transform_covariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -1142,8 +1142,8 @@ MappingQ::transform_covariant (std::vector > &dst, template void -MappingQ::transform_contravariant (std::vector > &dst, - const std::vector > &src, +MappingQ::transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { @@ -1170,8 +1170,8 @@ MappingQ::transform_contravariant (std::vector > &dst, template void -MappingQ::transform_contravariant (std::vector > &dst, - const std::vector > &src, +MappingQ::transform_contravariant (typename std::vector > &dst, + const typename std::vector > &src, const typename Mapping::InternalDataBase &mapping_data, const unsigned int src_offset) const { diff --git a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc index 2df84da7fe..b4e32950dc 100644 --- a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc +++ b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc @@ -35,7 +35,7 @@ template void MappingQ1Eulerian::compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - std::vector > &a) const + typename std::vector > &a) const { // The assertions can not be in the diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index 1d80986179..04eb18181f 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -738,7 +738,7 @@ void GridGenerator::laplace_transformation (Triangulation<1> &, template void GridGenerator::laplace_transformation (Triangulation &tria, - const std::map > &new_points) + const typename std::map > &new_points) { // first provide everything that is // needed for solving a Laplace diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index 65f397fa3e..646d67b77e 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -109,10 +109,10 @@ GridReordering<2>::Cell::insert_faces (std::map &global_faces) // defined by the order of vertices // in the cell object Face new_faces[GeometryInfo::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 diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 99f21cf5bc..26b07f2c05 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -3691,7 +3691,7 @@ Triangulation::n_vertices () const template -const std::vector > & +const typename std::vector > & Triangulation::get_vertices () const { return vertices; diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index a105f51cc0..c1c548281d 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -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; }; diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index 421a7c561d..4503806d2d 100644 --- a/deal.II/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/deal.II/source/grid/tria_boundary.cc @@ -44,7 +44,7 @@ template void Boundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &, - std::vector > &) const + typename std::vector > &) const { Assert (false, ExcPureVirtualFunctionCalled()); }; @@ -55,7 +55,7 @@ template void Boundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &, - std::vector > &) const + typename std::vector > &) 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)); }; diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc index 5431ac6058..27b39a1f43 100644 --- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc +++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc @@ -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)); }; diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index 091819f838..d38a34e1bf 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -828,7 +828,7 @@ void TimeStepBase_Tria::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 (*previous_tria, *tria); // perform flagging of cells // needed to regularize the @@ -1085,7 +1085,7 @@ void TimeStepBase_Tria::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 (*previous_tria, *tria); typename Triangulation::cell_iterator old_cell, new_cell, endc; old_cell = previous_tria->begin(0); @@ -1103,7 +1103,7 @@ void TimeStepBase_Tria::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 (*previous_tria, *tria); }; }; @@ -1159,7 +1159,7 @@ TimeStepBase_Tria_Flags::Flags::Flags (const bool delete_and_rebuild_tria, template -TimeStepBase_Tria_Flags::RefinementFlags::CorrectionRelaxations +typename TimeStepBase_Tria_Flags::RefinementFlags::CorrectionRelaxations TimeStepBase_Tria_Flags::RefinementFlags::default_correction_relaxations (1, // one element, denoting the first and all subsequent sweeps std::vector >(1, // one element, denoting the upper bound diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h index bc43eb0b1b..98cc8987aa 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.h @@ -536,7 +536,7 @@ class BlockSparseMatrix : public Subscriptor /** * Array of sub-matrices. */ - typename std::vector > > > sub_objects; + typename std::vector > > > sub_objects; }; diff --git a/deal.II/lac/include/lac/block_sparsity_pattern.h b/deal.II/lac/include/lac/block_sparsity_pattern.h index d7480cd448..34e71fb401 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -347,7 +347,7 @@ class BlockSparsityPatternBase : public Subscriptor /** * Array of sparsity patterns. */ - std::vector > > sub_objects; + typename std::vector > > sub_objects; /** * Object storing and managing @@ -534,7 +534,7 @@ template inline void BlockSparsityPatternBase::add (const unsigned int i, - const unsigned int j) + const unsigned int j) { // if you get an error here, are // you sure you called diff --git a/deal.II/lac/include/lac/filtered_matrix.h b/deal.II/lac/include/lac/filtered_matrix.h index 95ade6b7fb..03f4287ff7 100644 --- a/deal.II/lac/include/lac/filtered_matrix.h +++ b/deal.II/lac/include/lac/filtered_matrix.h @@ -487,7 +487,7 @@ class FilteredMatrix : public Subscriptor * the value to which it shall be * fixed. */ - std::vector constraints; + typename std::vector 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 &column_entries, + typename std::vector &column_entries, const bool matrix_is_symmetric) const; }; diff --git a/deal.II/lac/include/lac/sparsity_pattern.h b/deal.II/lac/include/lac/sparsity_pattern.h index 2940dbf3fc..7643878bab 100644 --- a/deal.II/lac/include/lac/sparsity_pattern.h +++ b/deal.II/lac/include/lac/sparsity_pattern.h @@ -898,7 +898,7 @@ class SparsityPattern : public Subscriptor */ template unsigned int - get_column_index_from_iterator (const std::pair &i); + get_column_index_from_iterator (const typename std::pair &i); /** * Likewise, but sometimes needed @@ -909,7 +909,7 @@ class SparsityPattern : public Subscriptor */ template unsigned int - get_column_index_from_iterator (const std::pair &i); + get_column_index_from_iterator (const typename std::pair &i); /** * Make all sparse matrices @@ -1099,7 +1099,7 @@ SparsityPattern::get_column_index_from_iterator (const unsigned int i) template inline unsigned int -SparsityPattern::get_column_index_from_iterator (const std::pair &i) +SparsityPattern::get_column_index_from_iterator (const typename std::pair &i) { return i.first; }; @@ -1109,7 +1109,7 @@ SparsityPattern::get_column_index_from_iterator (const std::pair inline unsigned int -SparsityPattern::get_column_index_from_iterator (const std::pair &i) +SparsityPattern::get_column_index_from_iterator (const typename std::pair &i) { return i.first; }; -- 2.39.5