From: wolf Date: Tue, 23 Jul 2002 14:16:00 +0000 (+0000) Subject: Fix a large number of extraneous typename keywords. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec653be7af9cec80c5e29c0ac1e595a7f00360b;p=dealii-svn.git Fix a large number of extraneous typename keywords. git-svn-id: https://svn.dealii.org/trunk@6266 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 95fcf5b3bc..ff2b8dda6e 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -59,6 +59,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is gcc-3.2) GXX_VERSION=gcc3.2 ;; + *3.3*) + AC_MSG_RESULT(C++ compiler is gcc-3.3) + GXX_VERSION=gcc3.3 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) dnl These compilers are too old to support a useful subset dnl of modern C++, so we don't support them @@ -556,9 +560,16 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl AC_MSG_RESULT(F77 compiler is gcc-3.2) F77_VERSION=gcc3.2 ;; + *3.3*) + AC_MSG_RESULT(F77 compiler is gcc-3.3) + F77_VERSION=gcc3.3 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) dnl These compilers are too old to support a useful subset - dnl of modern C++, so we don't support them + dnl of modern C++, so we don't support them. gcc2.7.2 is + dnl probably the only one that around on reasonably modern + dnl systems these times, but maybe someone tries to run + dnl deal.II on really old systems? AC_MSG_RESULT(F77 compiler is $G77_VERSION_STRING) AC_MSG_ERROR(F77 compiler is not supported) ;; @@ -630,7 +641,7 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl [ case "$F77_VERSION" in - egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.0 | gcc3.1 | gcc3.2) + egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[0123]) F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" F77FLAGSO="$FFLAGS -O2" diff --git a/deal.II/base/include/base/auto_derivative_function.h b/deal.II/base/include/base/auto_derivative_function.h index 522e5f2443..1c5702814b 100644 --- a/deal.II/base/include/base/auto_derivative_function.h +++ b/deal.II/base/include/base/auto_derivative_function.h @@ -176,7 +176,7 @@ class AutoDerivativeFunction : public Function * @p{formula}. */ virtual void vector_gradient (const Point &p, - typename std::vector > &gradients) const; + std::vector > &gradients) const; /** * Set @p{gradients} to the @@ -192,8 +192,8 @@ class AutoDerivativeFunction : public Function * @p{DifferenceFormula} * @p{formula}. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -215,8 +215,8 @@ class AutoDerivativeFunction : public Function * @p{DifferenceFormula} * @p{formula}. */ - virtual void vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const; + virtual void vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const; /** * Returns a @@ -243,7 +243,7 @@ class AutoDerivativeFunction : public Function * Includes the unit vectors * scaled by @p{h}. */ - typename std::vector > ht; + std::vector > ht; /** * Difference formula. Set by the diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index de191d23b4..3a358780dc 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -1276,7 +1276,7 @@ class DataOutBase * on the parameters. */ template - static void write_dx (const typename std::vector > &patches, + static void write_dx (const std::vector > &patches, const std::vector &data_names, const DXFlags &flags, std::ostream &out); @@ -1289,7 +1289,7 @@ class DataOutBase * on the parameters. */ template - static void write_ucd (const typename std::vector > &patches, + static void write_ucd (const std::vector > &patches, const std::vector &data_names, const UcdFlags &flags, std::ostream &out); @@ -1302,7 +1302,7 @@ class DataOutBase * on the parameters. */ template - static void write_gnuplot (const typename std::vector > &patches, + static void write_gnuplot (const std::vector > &patches, const std::vector &data_names, const GnuplotFlags &flags, std::ostream &out); @@ -1315,7 +1315,7 @@ class DataOutBase * on the parameters. */ template - static void write_povray (const typename std::vector > &patches, + static void write_povray (const std::vector > &patches, const std::vector &data_names, const PovrayFlags &flags, std::ostream &out); @@ -1328,7 +1328,7 @@ class DataOutBase * on the parameters. */ template - static void write_eps (const typename std::vector > &patches, + static void write_eps (const std::vector > &patches, const std::vector &data_names, const EpsFlags &flags, std::ostream &out); @@ -1341,7 +1341,7 @@ class DataOutBase * on the parameters. */ template - static void write_gmv (const typename std::vector > &patches, + static void write_gmv (const std::vector > &patches, const std::vector &data_names, const GmvFlags &flags, std::ostream &out); @@ -1354,7 +1354,7 @@ class DataOutBase * on the parameters. */ template - static void write_tecplot (const typename std::vector > &patches, + static void write_tecplot (const std::vector > &patches, const std::vector &data_names, const TecplotFlags &flags, std::ostream &out); @@ -1375,7 +1375,7 @@ class DataOutBase * ASCII output is still produced. */ template - static void write_tecplot_binary (const typename std::vector > &patches, + static void write_tecplot_binary (const std::vector > &patches, const std::vector &data_names, const TecplotFlags &flags, std::ostream &out); @@ -1388,7 +1388,7 @@ class DataOutBase * information on the parameters. */ template - static void write_vtk (const typename std::vector > &patches, + static void write_vtk (const std::vector > &patches, const std::vector &data_names, const VtkFlags &flags, std::ostream &out); @@ -1526,7 +1526,7 @@ class DataOutBase */ template static void - write_gmv_reorder_data_vectors (const typename std::vector > &patches, + write_gmv_reorder_data_vectors (const std::vector > &patches, std::vector > &data_vectors); }; @@ -1949,7 +1949,7 @@ class DataOutInterface : private DataOutBase * output functions to know what * they shall print. */ - virtual const typename std::vector > & + virtual const std::vector > & get_patches () const = 0; /** diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index 42a3d2365f..0232847d8f 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -200,7 +200,7 @@ class Function : public FunctionTime, * right size, i.e. the same * size as the @p{points} array. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -215,7 +215,7 @@ class Function : public FunctionTime, * the same number of components * as this function has. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; /** @@ -232,7 +232,7 @@ class Function : public FunctionTime, * function at the given point. */ virtual void vector_gradient (const Point &p, - typename std::vector > &gradients) const; + std::vector > &gradients) const; /** * Set @p{gradients} to the @@ -243,8 +243,8 @@ class Function : public FunctionTime, * right size, i.e. the same * size as the @p{points} array. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -261,8 +261,8 @@ class Function : public FunctionTime, * over the different components * of the function. */ - virtual void vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const; + virtual void vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const; /** * Compute the Laplacian of a @@ -283,7 +283,7 @@ class Function : public FunctionTime, * Compute the Laplacian of one * component at a set of points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -291,7 +291,7 @@ class Function : public FunctionTime, * Compute the Laplacians of all * components at a set of points. */ - virtual void vector_laplacian_list (const typename std::vector > &points, + virtual void vector_laplacian_list (const std::vector > &points, std::vector > &values) const; /** @@ -367,7 +367,7 @@ class ZeroFunction : public Function * the same size as the @p{points} * array. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -380,7 +380,7 @@ class ZeroFunction : public Function * the same size as the @p{points} * array. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; /** @@ -398,7 +398,7 @@ class ZeroFunction : public Function * for all components. */ virtual void vector_gradient (const Point &p, - typename std::vector > &gradients) const; + std::vector > &gradients) const; /** * Set @p{gradients} to the gradients of @@ -408,8 +408,8 @@ class ZeroFunction : public Function * already has the right size, i.e. * the same size as the @p{points} array. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -426,8 +426,8 @@ class ZeroFunction : public Function * over the different components * of the function. */ - virtual void vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const; + virtual void vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const; }; @@ -497,7 +497,7 @@ class ConstantFunction : public ZeroFunction * the same size as the @p{points} * array. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -510,7 +510,7 @@ class ConstantFunction : public ZeroFunction * the same size as the @p{points} * array. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; /** @@ -579,7 +579,7 @@ class ComponentSelectFunction : public ConstantFunction * the same size as the @p{points} * array. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; /** diff --git a/deal.II/base/include/base/function_derivative.h b/deal.II/base/include/base/function_derivative.h index 55f5794dce..d5a717f74e 100644 --- a/deal.II/base/include/base/function_derivative.h +++ b/deal.II/base/include/base/function_derivative.h @@ -81,7 +81,7 @@ class FunctionDerivative : public Function * values are accessed. */ FunctionDerivative (const Function &f, - const typename std::vector > &direction, + const std::vector > &direction, const double h = 1.e-6); /** @@ -109,7 +109,7 @@ class FunctionDerivative : public Function * Function values at multiple * points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -156,7 +156,7 @@ class FunctionDerivative : public Function * increment vector for the * formula. */ - typename std::vector > incr; + std::vector > incr; }; #endif diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index b462dc2270..2a8dcc3c5c 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -52,7 +52,7 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -65,8 +65,8 @@ namespace Functions /** Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -78,7 +78,7 @@ namespace Functions /** * Laplacian of the function at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; }; @@ -104,7 +104,7 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -117,8 +117,8 @@ namespace Functions /** Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -130,7 +130,7 @@ namespace Functions /** * Laplacian of the function at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; }; @@ -171,7 +171,7 @@ namespace Functions /** * Values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -184,8 +184,8 @@ namespace Functions /** * Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -197,7 +197,7 @@ namespace Functions /** * Laplacian at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; private: @@ -225,7 +225,7 @@ namespace Functions /** * Values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -238,8 +238,8 @@ namespace Functions /** * Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -251,7 +251,7 @@ namespace Functions /** * Laplacian at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -264,8 +264,8 @@ namespace Functions /** * Gradients at multiple points. */ - virtual void hessian_list (const typename std::vector > &points, - typename std::vector > &hessians, + virtual void hessian_list (const std::vector > &points, + std::vector > &hessians, const unsigned int component = 0) const; }; @@ -288,7 +288,7 @@ namespace Functions /** * Values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -301,8 +301,8 @@ namespace Functions /** * Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -314,7 +314,7 @@ namespace Functions /** * Laplacian at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; }; @@ -459,7 +459,7 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -472,8 +472,8 @@ namespace Functions /** Gradients at multiple points. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + virtual void gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component = 0) const; /** @@ -485,7 +485,7 @@ namespace Functions /** * Laplacian of the function at multiple points. */ - virtual void laplacian_list (const typename std::vector > &points, + virtual void laplacian_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; @@ -672,7 +672,7 @@ namespace Functions * coefficients in each space * direction as argument. */ - FourierSineSum (const typename std::vector > &fourier_coefficients, + FourierSineSum (const std::vector > &fourier_coefficients, const std::vector &weights); /** @@ -714,7 +714,7 @@ namespace Functions * Stored Fourier coefficients * and weights. */ - const typename std::vector > fourier_coefficients; + const std::vector > fourier_coefficients; const std::vector weights; }; @@ -738,7 +738,7 @@ namespace Functions * coefficients in each space * direction as argument. */ - FourierCosineSum (const typename std::vector > &fourier_coefficients, + FourierCosineSum (const std::vector > &fourier_coefficients, const std::vector &weights); /** @@ -780,7 +780,7 @@ namespace Functions * Stored Fourier coefficients * and weights. */ - const typename std::vector > fourier_coefficients; + const std::vector > fourier_coefficients; const std::vector weights; }; @@ -891,14 +891,14 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; /** * Function values at multiple points. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; }; @@ -940,14 +940,14 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; /** * Function values at multiple points. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; }; @@ -990,14 +990,14 @@ namespace Functions /** * Function values at multiple points. */ - virtual void value_list (const typename std::vector > &points, + virtual void value_list (const std::vector > &points, std::vector &values, const unsigned int component = 0) const; /** * Function values at multiple points. */ - virtual void vector_value_list (const typename std::vector > &points, + virtual void vector_value_list (const std::vector > &points, std::vector > &values) const; /** diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index eb078e5aeb..aae8b8a1d1 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -205,7 +205,7 @@ namespace MemoryConsumption */ template inline - unsigned int memory_consumption (const typename std::vector &v); + unsigned int memory_consumption (const std::vector &v); /** * Estimate the amount of memory @@ -293,7 +293,7 @@ namespace MemoryConsumption */ template inline - unsigned int memory_consumption (const typename std::vector &v); + unsigned int memory_consumption (const std::vector &v); /** * Specialization of the @@ -318,7 +318,7 @@ namespace MemoryConsumption */ template inline - unsigned int memory_consumption (const typename std::pair &p); + unsigned int memory_consumption (const std::pair &p); /** * Return the amount of memory @@ -466,7 +466,7 @@ namespace MemoryConsumption #endif template - unsigned int memory_consumption (const typename std::vector &v) + unsigned int memory_consumption (const std::vector &v) { unsigned int mem = sizeof(std::vector); const unsigned int n = v.size(); @@ -544,7 +544,7 @@ namespace MemoryConsumption template inline - unsigned int memory_consumption (const typename std::vector &v) + unsigned int memory_consumption (const std::vector &v) { return (v.capacity() * sizeof(T *) + sizeof(v)); @@ -554,7 +554,7 @@ namespace MemoryConsumption template inline - unsigned int memory_consumption (const typename std::pair &p) + unsigned int memory_consumption (const std::pair &p) { return (memory_consumption(p.first) + memory_consumption(p.second)); diff --git a/deal.II/base/include/base/polynomial.h b/deal.II/base/include/base/polynomial.h index 97b89b5ff6..e5eadbab0b 100644 --- a/deal.II/base/include/base/polynomial.h +++ b/deal.II/base/include/base/polynomial.h @@ -50,7 +50,7 @@ class Polynomial : public Subscriptor * the @p{coefficient} array * minus one. */ - Polynomial (const typename std::vector &coefficients); + Polynomial (const std::vector &coefficients); /** * Return the value of this @@ -78,8 +78,8 @@ class Polynomial : public Subscriptor * scheme for numerical stability * of the evaluation. */ - void value (const number x, - typename std::vector &values) const; + void value (const number x, + std::vector &values) const; /** * Degree of the polynomial. This @@ -155,22 +155,24 @@ class Polynomial : public Subscriptor protected: /** - * This function performs the actual scaling. + * This function performs the + * actual scaling. */ - static void scale (typename std::vector& coefficients, - const number factor); + static void scale (std::vector &coefficients, + const number factor); /** - * This function performs the actual shift + * This function performs the + * actual shift */ template - static void shift (typename std::vector& coefficients, - const number2 shift); + static void shift (std::vector &coefficients, + const number2 shift); /** * Multiply polynomial by a factor. */ - static void multiply (typename std::vector& coefficients, + static void multiply (std::vector& coefficients, const number factor); /** @@ -185,7 +187,7 @@ class Polynomial : public Subscriptor * since we want to allow copying * of polynomials. */ - typename std::vector coefficients; + std::vector coefficients; }; @@ -302,7 +304,7 @@ class Legendre : public Polynomial /** * Coefficients for the interval $[0,1]$. */ - static typename std::vector *> shifted_coefficients; + static std::vector *> shifted_coefficients; /** * Vector with already computed @@ -314,7 +316,7 @@ class Legendre : public Polynomial * vectors in order to simplify * programming multithread-safe. */ - static typename std::vector *> recursive_coefficients; + static std::vector *> recursive_coefficients; /** * Compute coefficients recursively. @@ -328,7 +330,7 @@ class Legendre : public Polynomial * constructor of * @ref{Polynomial}. */ - static const typename std::vector & + static const std::vector & get_coefficients (const unsigned int k); }; diff --git a/deal.II/base/include/base/polynomial_space.h b/deal.II/base/include/base/polynomial_space.h index 586642a612..a2b2cc98dd 100644 --- a/deal.II/base/include/base/polynomial_space.h +++ b/deal.II/base/include/base/polynomial_space.h @@ -55,7 +55,7 @@ class PolynomialSpace * @p{Polynomial}. */ template - PolynomialSpace(const typename std::vector &pols); + PolynomialSpace(const std::vector &pols); /** * Computes the value and the @@ -81,8 +81,8 @@ class PolynomialSpace */ void compute (const Point &unit_point, std::vector &values, - typename std::vector > &grads, - typename std::vector > &grad_grads) const; + std::vector > &grads, + std::vector > &grad_grads) const; /** * Computes the value of the @@ -179,7 +179,7 @@ class PolynomialSpace template template PolynomialSpace:: -PolynomialSpace (const typename std::vector &pols) +PolynomialSpace (const std::vector &pols) : polynomials (pols.begin(), pols.end()), n_pols (compute_n_pols(polynomials.size())) diff --git a/deal.II/base/include/base/quadrature.h b/deal.II/base/include/base/quadrature.h index 2abba15148..6c561493bb 100644 --- a/deal.II/base/include/base/quadrature.h +++ b/deal.II/base/include/base/quadrature.h @@ -170,8 +170,8 @@ class Quadrature : public Subscriptor * the weights sum up to one, but * this is not checked. */ - Quadrature (const typename std::vector > &points, - const std::vector &weights); + Quadrature (const std::vector > &points, + const std::vector &weights); /** * Construct a dummy quadrature @@ -188,7 +188,7 @@ class Quadrature : public Subscriptor * transformed cell in real * space. */ - Quadrature (const typename std::vector > &points); + Quadrature (const std::vector > &points); /** * Constructor for a one-point @@ -211,7 +211,7 @@ class Quadrature : public Subscriptor * Return a reference to the whole array of * quadrature points. */ - const typename std::vector > & get_points () const; + const std::vector > & get_points () const; /** * Return the weight of the @p{i}th @@ -238,7 +238,7 @@ class Quadrature : public Subscriptor * List of quadrature points. To be filled * by the constructors of derived classes. */ - typename std::vector > quadrature_points; + std::vector > quadrature_points; /** * List of weights of the quadrature points. @@ -420,7 +420,7 @@ class QProjector */ static void project_to_face (const SubQuadrature &quadrature, const unsigned int face_no, - typename std::vector > &q_points); + std::vector > &q_points); /** * Compute the quadrature points @@ -434,7 +434,7 @@ class QProjector static void project_to_subface (const SubQuadrature &quadrature, const unsigned int face_no, const unsigned int subface_no, - typename std::vector > &q_points); + std::vector > &q_points); /** * Take a face quadrature formula diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index 46127f55a3..e61d0ad6b3 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -137,8 +137,8 @@ class TensorFunction : public FunctionTime, * the right size, i.e. the same * size as the @p{points} array. */ - virtual void value_list (const typename std::vector > &points, - typename std::vector &values) const; + virtual void value_list (const std::vector > &points, + std::vector &values) const; /** * Return the gradient of the @@ -154,8 +154,8 @@ class TensorFunction : public FunctionTime, * the right size, i.e. the same * size as the @p{points} array. */ - virtual void gradient_list (const typename std::vector > &points, - typename std::vector &gradients) const; + virtual void gradient_list (const std::vector > &points, + std::vector &gradients) const; /** * Exception diff --git a/deal.II/base/include/base/tensor_product_polynomials.h b/deal.II/base/include/base/tensor_product_polynomials.h index 531938bdaf..06801ee2aa 100644 --- a/deal.II/base/include/base/tensor_product_polynomials.h +++ b/deal.II/base/include/base/tensor_product_polynomials.h @@ -48,7 +48,7 @@ class TensorProductPolynomials * member variable @p{polynomials}. */ template - TensorProductPolynomials(const typename std::vector &pols); + TensorProductPolynomials(const std::vector &pols); /** * Computes the value and the @@ -76,8 +76,8 @@ class TensorProductPolynomials */ void compute(const Point &unit_point, std::vector &values, - typename std::vector > &grads, - typename std::vector > &grad_grads) const; + std::vector > &grads, + std::vector > &grad_grads) const; /** * Computes the value of the @@ -214,7 +214,7 @@ class TensorProductPolynomials template template TensorProductPolynomials:: -TensorProductPolynomials(const typename std::vector &pols) +TensorProductPolynomials(const std::vector &pols) : polynomials (pols.begin(), pols.end()), n_tensor_pols(power(pols.size(), dim)), diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 9392669735..31eb3d17b0 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -4577,7 +4577,7 @@ namespace Threads * @p{[begin[i],end[i])}. */ template - typename std::vector > + std::vector > split_range (const ForwardIterator &begin, const ForwardIterator &end, const unsigned int n_intervals); @@ -7374,12 +7374,12 @@ namespace Threads template - typename std::vector > + std::vector > split_range (const ForwardIterator &begin, const ForwardIterator &end, const unsigned int n_intervals) { - typedef typename std::pair IteratorPair; + typedef std::pair IteratorPair; // in non-multithreaded mode, we // often have the case that this @@ -7389,7 +7389,7 @@ namespace Threads // case efficiently if (n_intervals==1) - return (typename std::vector + return (std::vector (1, IteratorPair(begin, end))); // if more than one interval diff --git a/deal.II/base/source/auto_derivative_function.cc b/deal.II/base/source/auto_derivative_function.cc index 5d44b32cc4..25aec586a2 100644 --- a/deal.II/base/source/auto_derivative_function.cc +++ b/deal.II/base/source/auto_derivative_function.cc @@ -118,7 +118,7 @@ AutoDerivativeFunction::gradient (const Point &p, template void AutoDerivativeFunction::vector_gradient (const Point &p, - typename std::vector > &gradients) const + std::vector > &gradients) const { Assert (gradients.size() == this->n_components, ExcDimensionMismatch(gradients.size(), this->n_components)); @@ -188,8 +188,8 @@ void AutoDerivativeFunction::vector_gradient (const Point &p, template -void AutoDerivativeFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, +void AutoDerivativeFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int comp) const { Assert (gradients.size() == points.size(), @@ -247,8 +247,8 @@ void AutoDerivativeFunction::gradient_list (const typename std::vector void AutoDerivativeFunction:: -vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const +vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index fdf4099731..9a0fd33d5a 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -66,7 +66,7 @@ DataOutBase::Patch::memory_consumption () const template -void DataOutBase::write_ucd (const typename std::vector > &patches, +void DataOutBase::write_ucd (const std::vector > &patches, const std::vector &data_names, const UcdFlags &flags, std::ostream &out) @@ -476,7 +476,7 @@ void DataOutBase::write_ucd (const typename std::vector > &p template -void DataOutBase::write_dx (const typename std::vector > &patches, +void DataOutBase::write_dx (const std::vector > &patches, const std::vector &data_names, const DXFlags &flags, std::ostream &out) @@ -974,7 +974,7 @@ void DataOutBase::write_dx (const typename std::vector > &pa template -void DataOutBase::write_gnuplot (const typename std::vector > &patches, +void DataOutBase::write_gnuplot (const std::vector > &patches, const std::vector &data_names, const GnuplotFlags &/*flags*/, std::ostream &out) @@ -1262,7 +1262,7 @@ void DataOutBase::write_gnuplot (const typename std::vector template -void DataOutBase::write_povray (const typename std::vector > &patches, +void DataOutBase::write_povray (const std::vector > &patches, const std::vector &data_names, const PovrayFlags &flags, std::ostream &out) @@ -1624,7 +1624,7 @@ void DataOutBase::write_povray (const typename std::vector > template -void DataOutBase::write_eps (const typename std::vector > &patches, +void DataOutBase::write_eps (const std::vector > &patches, const std::vector &/*data_names*/, const EpsFlags &flags, std::ostream &out) @@ -1988,7 +1988,7 @@ void DataOutBase::write_eps (const typename std::vector > &p template -void DataOutBase::write_gmv (const typename std::vector > &patches, +void DataOutBase::write_gmv (const std::vector > &patches, const std::vector &data_names, const GmvFlags &/*flags*/, std::ostream &out) @@ -2067,7 +2067,7 @@ void DataOutBase::write_gmv (const typename std::vector > &p std::vector > data_vectors (n_data_sets, std::vector (n_nodes)); Threads::ThreadManager thread_manager; - void (*fun_ptr) (const typename std::vector > &, + void (*fun_ptr) (const std::vector > &, std::vector > &) = &DataOutBase::template write_gmv_reorder_data_vectors; Threads::spawn (thread_manager, @@ -2303,7 +2303,7 @@ void DataOutBase::write_gmv (const typename std::vector > &p template -void DataOutBase::write_tecplot (const typename std::vector > &patches, +void DataOutBase::write_tecplot (const std::vector > &patches, const std::vector &data_names, const TecplotFlags &/*flags*/, std::ostream &out) @@ -2447,7 +2447,7 @@ void DataOutBase::write_tecplot (const typename std::vector std::vector > data_vectors (n_data_sets, std::vector (n_nodes)); Threads::ThreadManager thread_manager; - void (*fun_ptr) (const typename std::vector > &, + void (*fun_ptr) (const std::vector > &, std::vector > &) = &DataOutBase::template write_gmv_reorder_data_vectors; Threads::spawn (thread_manager, @@ -2720,7 +2720,7 @@ int & TecplotMacros::cd(const unsigned int i, const unsigned int j) template -void DataOutBase::write_tecplot_binary (const typename std::vector > &patches, +void DataOutBase::write_tecplot_binary (const std::vector > &patches, const std::vector &data_names, const TecplotFlags &flags, std::ostream &out) @@ -2874,7 +2874,7 @@ void DataOutBase::write_tecplot_binary (const typename std::vector > data_vectors (n_data_sets, std::vector (n_nodes)); Threads::ThreadManager thread_manager; - void (*fun_ptr) (const typename std::vector > &, + void (*fun_ptr) (const std::vector > &, std::vector > &) = &DataOutBase::template write_gmv_reorder_data_vectors; Threads::spawn (thread_manager, @@ -3102,7 +3102,7 @@ void DataOutBase::write_tecplot_binary (const typename std::vector -void DataOutBase::write_vtk (const typename std::vector > &patches, +void DataOutBase::write_vtk (const std::vector > &patches, const std::vector &data_names, const VtkFlags &/*flags*/, std::ostream &out) @@ -3198,7 +3198,7 @@ void DataOutBase::write_vtk (const typename std::vector > &p std::vector > data_vectors (n_data_sets, std::vector (n_nodes)); Threads::ThreadManager thread_manager; - void (*fun_ptr) (const typename std::vector > &, + void (*fun_ptr) (const std::vector > &, std::vector > &) = &DataOutBase::template write_gmv_reorder_data_vectors; Threads::spawn (thread_manager, @@ -3433,7 +3433,7 @@ void DataOutBase::write_vtk (const typename std::vector > &p template void -DataOutBase::write_gmv_reorder_data_vectors (const typename std::vector > &patches, +DataOutBase::write_gmv_reorder_data_vectors (const std::vector > &patches, std::vector > &data_vectors) { // unlike in the main function, we diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index d97171adaf..3949e15669 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -54,7 +54,7 @@ using namespace std; #endif template -void Function::value_list (const typename std::vector > &points, +void Function::value_list (const std::vector > &points, std::vector &values, const unsigned int component) const { @@ -70,7 +70,7 @@ void Function::value_list (const typename std::vector > &points, template -void Function::vector_value_list (const typename std::vector > &points, +void Function::vector_value_list (const std::vector > &points, std::vector > &values) const { // check whether component is in @@ -95,15 +95,15 @@ Tensor<1,dim> Function::gradient (const Point &, template void Function::vector_gradient (const Point &, - typename std::vector > &) const + std::vector > &) const { Assert (false, ExcPureFunctionCalled()); }; template -void Function::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, +void Function::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int component) const { Assert (gradients.size() == points.size(), @@ -115,8 +115,8 @@ 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 +void Function::vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); @@ -151,7 +151,7 @@ void Function::vector_laplacian (const Point &, template -void Function::laplacian_list (const typename std::vector > &points, +void Function::laplacian_list (const std::vector > &points, std::vector &laplacians, const unsigned int component) const { @@ -167,7 +167,7 @@ void Function::laplacian_list (const typename std::vector > &poi template -void Function::vector_laplacian_list (const typename std::vector > &points, +void Function::vector_laplacian_list (const std::vector > &points, std::vector > &laplacians) const { // check whether component is in @@ -225,7 +225,7 @@ void ZeroFunction::vector_value (const Point &, template -void ZeroFunction::value_list (const typename std::vector > &points, +void ZeroFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int /*component*/) const { Assert (values.size() == points.size(), @@ -236,7 +236,7 @@ void ZeroFunction::value_list (const typename std::vector > &poi template -void ZeroFunction::vector_value_list (const typename std::vector > &points, +void ZeroFunction::vector_value_list (const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), @@ -261,7 +261,7 @@ Tensor<1,dim> ZeroFunction::gradient (const Point &, template void ZeroFunction::vector_gradient (const Point &, - typename std::vector > &gradients) const + std::vector > &gradients) const { Assert (gradients.size() == this->n_components, ExcDimensionMismatch(gradients.size(), this->n_components)); @@ -272,8 +272,8 @@ void ZeroFunction::vector_gradient (const Point &, template -void ZeroFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, +void ZeroFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int /*component*/) const { Assert (gradients.size() == points.size(), @@ -285,8 +285,8 @@ void ZeroFunction::gradient_list (const typename std::vector > & template -void ZeroFunction::vector_gradient_list (const typename std::vector > &points, - typename std::vector > > &gradients) const +void ZeroFunction::vector_gradient_list (const std::vector > &points, + std::vector > > &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); @@ -334,7 +334,7 @@ void ConstantFunction::vector_value (const Point &, template -void ConstantFunction::value_list (const typename std::vector > &points, +void ConstantFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int /*component*/) const { @@ -346,7 +346,7 @@ void ConstantFunction::value_list (const typename std::vector > template -void ConstantFunction::vector_value_list (const typename std::vector > &points, +void ConstantFunction::vector_value_list (const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), @@ -397,7 +397,7 @@ void ComponentSelectFunction::vector_value (const Point &, template -void ComponentSelectFunction::vector_value_list (const typename std::vector > &points, +void ComponentSelectFunction::vector_value_list (const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), diff --git a/deal.II/base/source/function_derivative.cc b/deal.II/base/source/function_derivative.cc index 95a4bbd4d1..633f194441 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 typename std::vector >& dir, + const std::vector >& dir, const double h) : Function (f.n_components, f.get_time()), @@ -92,7 +92,7 @@ using namespace std; template void -FunctionDerivative::value_list (const typename std::vector > &points, +FunctionDerivative::value_list (const std::vector > &points, std::vector &values, const unsigned int component) const { diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 789a3d84d3..6ba48bc36d 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -51,7 +51,7 @@ namespace Functions template void - SquareFunction::value_list (const typename std::vector > &points, + SquareFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -77,7 +77,7 @@ namespace Functions template void - SquareFunction::laplacian_list (const typename std::vector > &points, + SquareFunction::laplacian_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -102,8 +102,8 @@ namespace Functions template void - SquareFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + SquareFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == points.size(), @@ -129,7 +129,7 @@ namespace Functions template void - Q1WedgeFunction::value_list (const typename std::vector > &points, + Q1WedgeFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -155,7 +155,7 @@ namespace Functions template void - Q1WedgeFunction::laplacian_list (const typename std::vector > &points, + Q1WedgeFunction::laplacian_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -183,8 +183,8 @@ namespace Functions template void - Q1WedgeFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + Q1WedgeFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == points.size(), @@ -229,7 +229,7 @@ namespace Functions template void - PillowFunction::value_list (const typename std::vector > &points, + PillowFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -281,7 +281,7 @@ namespace Functions template void - PillowFunction::laplacian_list (const typename std::vector > &points, + PillowFunction::laplacian_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -338,8 +338,8 @@ namespace Functions template void - PillowFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + PillowFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == points.size(), @@ -391,7 +391,7 @@ namespace Functions template void - CosineFunction::value_list (const typename std::vector > &points, + CosineFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -439,7 +439,7 @@ namespace Functions template void - CosineFunction::laplacian_list (const typename std::vector > &points, + CosineFunction::laplacian_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -494,8 +494,8 @@ namespace Functions template void - CosineFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + CosineFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == points.size(), @@ -575,8 +575,8 @@ namespace Functions template void - CosineFunction::hessian_list (const typename std::vector > &points, - typename std::vector > &hessians, + CosineFunction::hessian_list (const std::vector > &points, + std::vector > &hessians, const unsigned int) const { Assert (hessians.size() == points.size(), @@ -651,7 +651,7 @@ namespace Functions template void - ExpFunction::value_list (const typename std::vector > &points, + ExpFunction::value_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -699,7 +699,7 @@ namespace Functions template void - ExpFunction::laplacian_list (const typename std::vector > &points, + ExpFunction::laplacian_list (const std::vector > &points, std::vector &values, const unsigned int) const { @@ -754,8 +754,8 @@ namespace Functions template void - ExpFunction::gradient_list (const typename std::vector > &points, - typename std::vector > &gradients, + ExpFunction::gradient_list (const std::vector > &points, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == points.size(), @@ -1024,7 +1024,7 @@ namespace Functions template void - JumpFunction::value_list (const typename std::vector > &p, + JumpFunction::value_list (const std::vector > &p, std::vector &values, const unsigned int) const { @@ -1052,7 +1052,7 @@ namespace Functions template void - JumpFunction::laplacian_list (const typename std::vector > &p, + JumpFunction::laplacian_list (const std::vector > &p, std::vector &values, const unsigned int) const { @@ -1088,8 +1088,8 @@ namespace Functions template void - JumpFunction::gradient_list (const typename std::vector > &p, - typename std::vector > &gradients, + JumpFunction::gradient_list (const std::vector > &p, + std::vector > &gradients, const unsigned int) const { Assert (gradients.size() == p.size(), @@ -1220,7 +1220,7 @@ namespace Functions template FourierSineSum:: - FourierSineSum (const typename std::vector > &fourier_coefficients, + FourierSineSum (const std::vector > &fourier_coefficients, const std::vector &weights) : Function (1), @@ -1291,7 +1291,7 @@ namespace Functions template FourierCosineSum:: - FourierCosineSum (const typename std::vector > &fourier_coefficients, + FourierCosineSum (const std::vector > &fourier_coefficients, const std::vector &weights) : Function (1), diff --git a/deal.II/base/source/function_lib_cutoff.cc b/deal.II/base/source/function_lib_cutoff.cc index 59105accd2..e122076160 100644 --- a/deal.II/base/source/function_lib_cutoff.cc +++ b/deal.II/base/source/function_lib_cutoff.cc @@ -97,8 +97,8 @@ namespace Functions template void - CutOffFunctionLinfty::value_list (const typename std::vector > &points, - std::vector &values, + CutOffFunctionLinfty::value_list (const std::vector > &points, + std::vector &values, const unsigned int component) const { Assert (values.size() == points.size(), @@ -120,7 +120,7 @@ namespace Functions template void CutOffFunctionLinfty::vector_value_list ( - const typename std::vector > &points, + const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), @@ -169,8 +169,8 @@ namespace Functions template void - CutOffFunctionW1::value_list (const typename std::vector > &points, - std::vector &values, + CutOffFunctionW1::value_list (const std::vector > &points, + std::vector &values, const unsigned int component) const { Assert (values.size() == points.size(), @@ -193,7 +193,7 @@ namespace Functions template void CutOffFunctionW1::vector_value_list ( - const typename std::vector > &points, + const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), @@ -247,8 +247,8 @@ namespace Functions template void - CutOffFunctionCinfty::value_list (const typename std::vector > &points, - std::vector &values, + CutOffFunctionCinfty::value_list (const std::vector > &points, + std::vector &values, const unsigned int component) const { Assert (values.size() == points.size(), @@ -278,7 +278,7 @@ namespace Functions template void CutOffFunctionCinfty::vector_value_list ( - const typename std::vector > &points, + const std::vector > &points, std::vector > &values) const { Assert (values.size() == points.size(), diff --git a/deal.II/base/source/legendre.cc b/deal.II/base/source/legendre.cc index 68926d5858..4b059b830a 100644 --- a/deal.II/base/source/legendre.cc +++ b/deal.II/base/source/legendre.cc @@ -28,13 +28,13 @@ // Reserve space for polynomials up to degree 19. Should be sufficient // for the start. template -typename std::vector *> +std::vector *> Legendre::recursive_coefficients( - 20, static_cast*>(0)); + 20, static_cast*>(0)); template -typename std::vector *> +std::vector *> Legendre::shifted_coefficients( - 20, static_cast*>(0)); + 20, static_cast*>(0)); // have a lock that guarantees that at most one thread is changing and @@ -163,7 +163,7 @@ Legendre::compute_coefficients (const unsigned int k_) template -const typename std::vector & +const 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 c51c005210..28050a6720 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -16,7 +16,7 @@ #include template -Polynomial::Polynomial (const typename std::vector &a): +Polynomial::Polynomial (const std::vector &a): coefficients(a) {} @@ -42,7 +42,7 @@ Polynomial::value (const number x) const template void Polynomial::value (const number x, - typename std::vector &values) const + std::vector &values) const { Assert (coefficients.size() > 0, ExcVoidPolynomial()); Assert (values.size() > 0, ExcEmptyArray()); @@ -94,7 +94,7 @@ Polynomial::value (const number x, template void -Polynomial::scale(typename std::vector& coefficients, +Polynomial::scale(std::vector& coefficients, const number factor) { double f = 1.; @@ -119,7 +119,7 @@ Polynomial::scale(const number factor) template void -Polynomial::multiply(typename std::vector& coefficients, +Polynomial::multiply(std::vector& coefficients, const number factor) { for (typename std::vector::iterator c = coefficients.begin(); @@ -132,7 +132,7 @@ Polynomial::multiply(typename std::vector& coefficients, template template void -Polynomial::shift(typename std::vector& coefficients, +Polynomial::shift(std::vector& coefficients, const number2 offset) { #ifdef DEAL_II_LONG_DOUBLE_LOOP_BUG diff --git a/deal.II/base/source/polynomial_space.cc b/deal.II/base/source/polynomial_space.cc index 1c01c060b1..50e9453f26 100644 --- a/deal.II/base/source/polynomial_space.cc +++ b/deal.II/base/source/polynomial_space.cc @@ -136,8 +136,8 @@ template void PolynomialSpace::compute( const Point &p, std::vector &values, - typename std::vector > &grads, - typename std::vector > &grad_grads) const + std::vector > &grads, + std::vector > &grad_grads) const { const unsigned int n_1d=polynomials.size(); diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index cdfae8341f..d32dc8c91c 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -41,7 +41,7 @@ using namespace std; template -Quadrature::Quadrature (const typename std::vector > &points, +Quadrature::Quadrature (const std::vector > &points, const std::vector &weights) : n_quadrature_points(points.size()), @@ -55,7 +55,7 @@ Quadrature::Quadrature (const typename std::vector > &points, template -Quadrature::Quadrature (const typename std::vector > &points) +Quadrature::Quadrature (const std::vector > &points) : n_quadrature_points(points.size()), quadrature_points(points), @@ -170,7 +170,7 @@ const std::vector > & Quadrature<0>::get_points () const template -const typename std::vector > & Quadrature::get_points () const +const std::vector > & Quadrature::get_points () const { return quadrature_points; }; @@ -582,7 +582,7 @@ QProjector::project_to_all_faces (const SubQuadrature &quadrature) n_faces = GeometryInfo::faces_per_cell; // first fix quadrature points - typename std::vector > q_points (n_points * n_faces); + std::vector > q_points (n_points * n_faces); std::vector > help(n_points); // project to each face and copy @@ -594,7 +594,7 @@ QProjector::project_to_all_faces (const SubQuadrature &quadrature) } // next copy over weights - typename std::vector weights (n_points * n_faces); + std::vector weights (n_points * n_faces); for (unsigned int face=0; face::project_to_all_subfaces (const SubQuadrature &quadrature) subfaces_per_face = GeometryInfo::subfaces_per_face; // first fix quadrature points - typename std::vector > q_points (n_points * n_faces * subfaces_per_face); + std::vector > q_points (n_points * n_faces * subfaces_per_face); std::vector > help(n_points); // project to each face and copy @@ -638,7 +638,7 @@ QProjector::project_to_all_subfaces (const SubQuadrature &quadrature) }; // next copy over weights - typename std::vector weights (n_points * n_faces * subfaces_per_face); + std::vector weights (n_points * n_faces * subfaces_per_face); for (unsigned int face=0; face void -TensorFunction::value_list (const typename std::vector > &points, - typename std::vector &values) const +TensorFunction::value_list (const std::vector > &points, + std::vector &values) const { Assert (values.size() == points.size(), ExcDimensionMismatch(values.size(), points.size())); @@ -74,8 +74,8 @@ TensorFunction::gradient (const Point &) const template void -TensorFunction::gradient_list (const typename std::vector > &points, - typename std::vector &gradients) const +TensorFunction::gradient_list (const std::vector > &points, + std::vector &gradients) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); diff --git a/deal.II/base/source/tensor_product_polynomials.cc b/deal.II/base/source/tensor_product_polynomials.cc index e6522ac3fd..a22a476790 100644 --- a/deal.II/base/source/tensor_product_polynomials.cc +++ b/deal.II/base/source/tensor_product_polynomials.cc @@ -110,8 +110,8 @@ template void TensorProductPolynomials::compute( const Point &p, std::vector &values, - typename std::vector > &grads, - typename std::vector > &grad_grads) const + std::vector > &grads, + std::vector > &grad_grads) const { const unsigned int n_pols=polynomials.size(); diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index 1391ea40b6..c744388bd9 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -1129,7 +1129,7 @@ class DoFHandler : public Subscriptor, * @p{levels[]} tree of the @ref{Triangulation} * objects. */ - typename std::vector*> levels; + std::vector*> levels; /** * Store the number of dofs created last diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index be1060f524..e8409aaab0 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1066,7 +1066,7 @@ class DoFTools static void map_dofs_to_support_points (const Mapping &mapping, const DoFHandler &dof_handler, - typename std::vector > &support_points); + std::vector > &support_points); /** * This is the opposite function @@ -1099,7 +1099,7 @@ class DoFTools static void map_support_points_to_dofs (const Mapping &mapping, const DoFHandler &dof_handler, - typename std::map, unsigned int, Comp> &point_to_index_map); + std::map, unsigned int, Comp> &point_to_index_map); /** * Exception @@ -1210,7 +1210,7 @@ void DoFTools:: map_support_points_to_dofs (const Mapping &mapping, const DoFHandler &dof_handler, - typename std::map, unsigned int, Comp> &point_to_index_map) + 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/dofs/function_map.h b/deal.II/deal.II/include/dofs/function_map.h index a338b58e25..71a86fe8a3 100644 --- a/deal.II/deal.II/include/dofs/function_map.h +++ b/deal.II/deal.II/include/dofs/function_map.h @@ -45,7 +45,7 @@ struct FunctionMap * name it in the fashion of the * STL local typedefs. */ - typedef typename std::map*> type; + typedef std::map*> type; }; diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index 0a3d4d6726..6d2312c7f5 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -404,7 +404,7 @@ class FiniteElementBase : public Subscriptor, * entries in lower dimensions * are missing. */ - typename std::vector*> differences; + std::vector*> differences; }; /** @@ -851,7 +851,7 @@ class FiniteElementBase : public Subscriptor, * See the class documentation * for details on support points. */ - const typename std::vector > & + const std::vector > & get_unit_support_points () const; /** @@ -920,7 +920,7 @@ class FiniteElementBase : public Subscriptor, * See the class documentation * for details on support points. */ - const typename std::vector > & + const std::vector > & get_unit_face_support_points () const; /** @@ -1303,7 +1303,7 @@ class FiniteElementBase : public Subscriptor, * support points. In that case, * this field remains empty. */ - typename std::vector > unit_support_points; + std::vector > unit_support_points; /** * Same for the faces. See the @@ -1313,7 +1313,7 @@ class FiniteElementBase : public Subscriptor, * what contributes a face * support point. */ - typename std::vector > unit_face_support_points; + std::vector > unit_face_support_points; /** * For each shape function, give diff --git a/deal.II/deal.II/include/fe/fe_dgp.h b/deal.II/deal.II/include/fe/fe_dgp.h index 5393e2aa27..1e30f50698 100644 --- a/deal.II/deal.II/include/fe/fe_dgp.h +++ b/deal.II/deal.II/include/fe/fe_dgp.h @@ -426,7 +426,7 @@ class FE_DGP : public FiniteElement * multiplication) when * visiting an actual cell. */ - typename std::vector > > shape_gradients; + std::vector > > shape_gradients; }; /** diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index 84afc997bb..de35097d63 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -454,7 +454,7 @@ class FE_DGQ : public FiniteElement * multiplication) when * visiting an actual cell. */ - typename std::vector > > shape_gradients; + std::vector > > shape_gradients; }; /** diff --git a/deal.II/deal.II/include/fe/fe_nedelec.h b/deal.II/deal.II/include/fe/fe_nedelec.h index 6c5717e2a4..c8590d2d7f 100644 --- a/deal.II/deal.II/include/fe/fe_nedelec.h +++ b/deal.II/deal.II/include/fe/fe_nedelec.h @@ -458,7 +458,7 @@ class FE_Nedelec : public FiniteElement * multiplication) when * visiting an actual cell. */ - typename std::vector > > shape_gradients; + 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 ad5b786f01..b1d8a9e46c 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -799,7 +799,7 @@ class FE_Q : public FiniteElement * multiplication) when * visiting an actual cell. */ - typename std::vector > > shape_gradients; + std::vector > > shape_gradients; }; /** diff --git a/deal.II/deal.II/include/fe/fe_system.h b/deal.II/deal.II/include/fe/fe_system.h index 663c8a925e..04f164a91f 100644 --- a/deal.II/deal.II/include/fe/fe_system.h +++ b/deal.II/deal.II/include/fe/fe_system.h @@ -452,7 +452,7 @@ class FESystem : public FiniteElement * Pairs of multiplicity and * element type. */ - typedef typename std::pair *, unsigned int> ElementPair; + typedef std::pair *, unsigned int> ElementPair; /** * Pointer to underlying finite @@ -465,7 +465,7 @@ class FESystem : public FiniteElement * created by the constructor and * constant afterwards. */ - typename std::vector base_elements; + std::vector base_elements; /** @@ -772,7 +772,7 @@ class FESystem : public FiniteElement * by the InternalData * constructor. */ - typename std::vector *> base_fe_values_datas; + std::vector *> base_fe_values_datas; }; }; diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 4ae07bcce3..5f4532419d 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -103,7 +103,7 @@ class FEValuesData * @ref{ShapeVector} data type. */ typedef - typename std::vector > > + std::vector > > GradientVector; /** @@ -111,7 +111,7 @@ class FEValuesData * derivatives. */ typedef - typename std::vector > > + std::vector > > GradGradVector; /** @@ -165,21 +165,21 @@ class FEValuesData * real element, rather than on the * reference element. */ - typename std::vector > quadrature_points; + std::vector > quadrature_points; /** * List of outward normal vectors at the * quadrature points. This field is filled * in by the finite element class. */ - typename std::vector > normal_vectors; + std::vector > normal_vectors; /** * List of boundary forms at the * quadrature points. This field is filled * in by the finite element class. */ - typename std::vector > boundary_forms; + std::vector > boundary_forms; /** * Indicate the first row which a @@ -442,7 +442,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_values (const InputVector& fe_function, - typename std::vector& values) const; + std::vector& values) const; /** * Access to vector valued finite @@ -462,7 +462,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_values (const InputVector &fe_function, - typename std::vector > &values) const; + std::vector > &values) const; /** * Gradient of the @p{i}th shape @@ -547,7 +547,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_grads (const InputVector &fe_function, - typename std::vector > &gradients) const; + std::vector > &gradients) const; /** * Return the gradients of the finite @@ -576,7 +576,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_grads (const InputVector &fe_function, - typename std::vector > > &gradients) const; + std::vector > > &gradients) const; /** * 2nd derivatives of @@ -663,7 +663,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_2nd_derivatives (const InputVector& fe_function, - typename std::vector >& second_derivatives) const; + std::vector >& second_derivatives) const; /** @@ -690,7 +690,7 @@ class FEValuesBase : protected FEValuesData */ template void get_function_2nd_derivatives (const InputVector &fe_function, - typename std::vector > > &second_derivatives) const; + std::vector > > &second_derivatives) const; /** * Position of the @p{i}th @@ -702,7 +702,7 @@ class FEValuesBase : protected FEValuesData * Return a pointer to the vector of * quadrature points. */ - const typename std::vector > & get_quadrature_points () const; + const std::vector > & get_quadrature_points () const; /** * Mapped quadrature weight. This @@ -995,13 +995,13 @@ class FEFaceValuesBase : public FEValuesBase * vectors to the cell at the * quadrature points. */ - const typename std::vector > & get_normal_vectors () const; + const std::vector > & get_normal_vectors () const; /** * Return the list of outward normal * vectors times quadrature weights. */ - const typename std::vector > & get_boundary_forms () const; + const 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 d8993859bb..92c69298cb 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -345,7 +345,7 @@ class Mapping : public Subscriptor fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature &quadrature, InternalDataBase &internal, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values) const = 0; /** @@ -374,10 +374,10 @@ class Mapping : public Subscriptor const unsigned int face_no, const Quadrature &quadrature, InternalDataBase &internal, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_form, - typename std::vector > &normal_vectors) const = 0; + std::vector > &boundary_form, + std::vector > &normal_vectors) const = 0; /** * See above. @@ -388,10 +388,10 @@ class Mapping : public Subscriptor const unsigned int sub_no, const Quadrature &quadrature, InternalDataBase &internal, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_form, - typename std::vector > &normal_vectors) const = 0; + std::vector > &boundary_form, + std::vector > &normal_vectors) const = 0; /** * Give class @p{FEValues} access diff --git a/deal.II/deal.II/include/fe/mapping_c1.h b/deal.II/deal.II/include/fe/mapping_c1.h index 92a56d66fd..dd092c989e 100644 --- a/deal.II/deal.II/include/fe/mapping_c1.h +++ b/deal.II/deal.II/include/fe/mapping_c1.h @@ -72,7 +72,7 @@ class MappingC1 : public MappingQ */ virtual void add_line_support_points (const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; /** * For @p{dim=3}. Append the @@ -98,7 +98,7 @@ class MappingC1 : public MappingQ */ virtual void add_quad_support_points(const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; }; diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 558a3cb6a1..e08d594c41 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -67,7 +67,7 @@ class MappingCartesian : public Mapping fill_fe_values (const typename DoFHandler::cell_iterator &cell, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values) const ; /** @@ -79,10 +79,10 @@ class MappingCartesian : public Mapping const unsigned int face_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_form, - typename std::vector > &normal_vectors) const ; + std::vector > &boundary_form, + std::vector > &normal_vectors) const ; /** * Implementation of the interface in @@ -94,10 +94,10 @@ class MappingCartesian : public Mapping const unsigned int sub_no, const Quadrature& quadrature, typename Mapping::InternalDataBase &mapping_data, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_form, - typename std::vector > &normal_vectors) const ; + std::vector > &boundary_form, + std::vector > &normal_vectors) const ; /** @@ -116,9 +116,9 @@ class MappingCartesian : public Mapping */ virtual void transform_contravariant (typename std::vector >::iterator begin, - typename std::vector >::const_iterator end, - typename std::vector >::const_iterator src, - const typename Mapping::InternalDataBase &mapping_data) const; + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, + const typename Mapping::InternalDataBase &mapping_data) const; /** * Transforms the point @p{p} on @@ -162,7 +162,6 @@ class MappingCartesian : public Mapping DeclException0 (ExcInvalidData); protected: - /** * Storage for internal data of * d-linear transformation. @@ -196,7 +195,7 @@ class MappingCartesian : public Mapping * points. Especially, all * points of all faces. */ - typename std::vector > quadrature_points; + std::vector > quadrature_points; /** * Unit tangential vectors. Used @@ -206,12 +205,12 @@ class MappingCartesian : public Mapping * * Filled once. */ - typename std::vector > > unit_tangentials; + std::vector > > unit_tangentials; /** * Auxiliary vectors for internal use. */ - typename std::vector > > aux; + std::vector > > aux; }; /** @@ -222,8 +221,8 @@ class MappingCartesian : public Mapping const unsigned int face_no, const unsigned int sub_no, InternalData& data, - typename std::vector > &quadrature_points, - typename std::vector >& normal_vectors) const; + std::vector > &quadrature_points, + 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 8608ab103f..bf1934d62c 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -94,9 +94,9 @@ class MappingQ : public MappingQ1 */ virtual void transform_contravariant (typename std::vector >::iterator begin, - typename std::vector >::const_iterator end, - typename std::vector >::const_iterator src, - const typename Mapping::InternalDataBase &mapping_data) const; + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, + const typename Mapping::InternalDataBase &mapping_data) const; /** * Return the degree of the @@ -137,7 +137,7 @@ class MappingQ : public MappingQ1 * Filled (hardcoded) once in * @p{get_face_data}. */ - typename std::vector > > unit_normals; + std::vector > > unit_normals; /** * Flag that is set by the @@ -225,7 +225,7 @@ class MappingQ : public MappingQ1 */ virtual void add_line_support_points (const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; /** * For @p{dim=3}. Append the @@ -252,7 +252,7 @@ class MappingQ : public MappingQ1 */ virtual void add_quad_support_points(const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; private: @@ -288,7 +288,7 @@ class MappingQ : public MappingQ1 * derivatives. */ virtual void - compute_shapes_virtual (const typename std::vector > &unit_points, + compute_shapes_virtual (const std::vector > &unit_points, typename MappingQ1::InternalData &data) const; /** @@ -345,7 +345,7 @@ class MappingQ : public MappingQ1 * points are appended. */ void apply_laplace_vector(const std::vector > &lvs, - typename std::vector > &a) const; + std::vector > &a) const; /** * Computes the support points of @@ -353,7 +353,7 @@ class MappingQ : public MappingQ1 */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; /** * Computes all support points of @@ -371,7 +371,7 @@ class MappingQ : public MappingQ1 */ void compute_support_points_laplace( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; /** * Simple version of the @@ -395,7 +395,7 @@ class MappingQ : public MappingQ1 */ void compute_support_points_simple( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + std::vector > &a) const; /** * For @p{dim=2} and 3. Simple @@ -408,7 +408,7 @@ class MappingQ : public MappingQ1 */ //TODO:[RH] (later) remove this function altogether? void fill_quad_support_points_simple (const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + 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 9492e290a1..13fb8dab1a 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -233,7 +233,7 @@ class MappingQ1 : public Mapping * * Computed once. */ - typename std::vector > shape_derivatives; + std::vector > shape_derivatives; /** * Tensors of covariant @@ -241,7 +241,7 @@ class MappingQ1 : public Mapping * * Computed on each cell. */ - typename std::vector > covariant; + std::vector > covariant; /** * Tensors of covariant @@ -249,7 +249,7 @@ class MappingQ1 : public Mapping * * Computed on each cell. */ - typename std::vector > contravariant; + std::vector > contravariant; /** * Unit tangential vectors. Used @@ -259,19 +259,19 @@ class MappingQ1 : public Mapping * * Filled once. */ - typename std::vector > > unit_tangentials; + std::vector > > unit_tangentials; /** * Auxuliary vectors for internal use. */ - typename std::vector > > aux; + std::vector > > aux; /** * Stores the support points of * the mapping shape functions on * the @p{cell_of_current_support_points}. */ - typename std::vector > mapping_support_points; + std::vector > mapping_support_points; /** * Stores the cell of which the @@ -359,7 +359,7 @@ class MappingQ1 : public Mapping * @p{data.is_mapping_q1_data} * equals @p{true} or @p{false}. */ - void compute_shapes (const typename std::vector > &unit_points, + void compute_shapes (const std::vector > &unit_points, InternalData &data) const; /** @@ -400,7 +400,7 @@ class MappingQ1 : public Mapping const unsigned int npts, const unsigned int offset, InternalData &data, - typename std::vector > &quadrature_points) const; + std::vector > &quadrature_points) const; /** * Do the computation for the @@ -413,16 +413,16 @@ class MappingQ1 : public Mapping const unsigned int offset, const std::vector &weights, InternalData &mapping_data, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_form, - typename std::vector > &normal_vectors) const; + std::vector > &boundary_form, + std::vector > &normal_vectors) const; /** * Compute shape values and/or * derivatives. */ - virtual void compute_shapes_virtual (const typename std::vector > &unit_points, + virtual void compute_shapes_virtual (const std::vector > &unit_points, InternalData &data) const; /** @@ -535,7 +535,7 @@ class MappingQ1 : public Mapping */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + 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 029cee15be..003cc10615 100644 --- a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h @@ -144,7 +144,7 @@ class MappingQ1Eulerian : public MappingQ1 */ virtual void compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const; + 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 3c7daf17dd..bf49966857 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -500,7 +500,7 @@ class GridGenerator */ template static void laplace_transformation (Triangulation &tria, - const typename std::map > &new_points); + const std::map > &new_points); /** * Declaration of same function diff --git a/deal.II/deal.II/include/grid/grid_in.h b/deal.II/deal.II/include/grid/grid_in.h index b920d29d0a..a245bffaf3 100644 --- a/deal.II/deal.II/include/grid/grid_in.h +++ b/deal.II/deal.II/include/grid/grid_in.h @@ -257,8 +257,8 @@ class GridIn * have to eliminate unused * vertices beforehand. */ - static void delete_unused_vertices (typename std::vector > &vertices, - typename std::vector > &cells, + static void delete_unused_vertices (std::vector > &vertices, + std::vector > &cells, SubCellData &subcelldata); /** @@ -306,8 +306,8 @@ class GridIn * without further ado by the * user. */ - static void debug_output_grid (const typename std::vector > &cells, - const typename std::vector > &vertices, + static void debug_output_grid (const std::vector > &cells, + const std::vector > &vertices, std::ostream &out); }; diff --git a/deal.II/deal.II/include/grid/grid_reordering.h b/deal.II/deal.II/include/grid/grid_reordering.h index 733cc26509..b597e0e851 100644 --- a/deal.II/deal.II/include/grid/grid_reordering.h +++ b/deal.II/deal.II/include/grid/grid_reordering.h @@ -526,7 +526,7 @@ class GridReordering : private GridReorderingInfo * general documentation of this * class. */ - static void reorder_cells (typename std::vector > &original_cells); + static void reorder_cells (std::vector > &original_cells); private: @@ -689,7 +689,7 @@ class GridReordering : private GridReorderingInfo * @p{adjacent_cells} field * of the inserted faces. */ - void insert_faces (typename std::map &global_faces); + void insert_faces (std::map &global_faces); /** * Find out the neighbors of the @@ -878,11 +878,11 @@ class GridReordering : private GridReorderingInfo * as recursive calls but rather * as eliminated tail-recursion. */ - static void track_back (typename std::vector &cells, + static void track_back (std::vector &cells, RotationStack &rotation_states, const unsigned int track_back_to_cell); - static bool try_rotate_single_neighbors (typename std::vector &cells, + static bool try_rotate_single_neighbors (std::vector &cells, RotationStack &rotation_states); /** @@ -902,8 +902,8 @@ class GridReordering : private GridReorderingInfo * between original cells and * presorted cells. */ - static void find_reordering (typename std::vector &cells, - typename std::vector > &original_cells, + static void find_reordering (std::vector &cells, + std::vector > &original_cells, const std::vector &new_cell_numbers); /** @@ -919,8 +919,8 @@ class GridReordering : private GridReorderingInfo */ static std::vector - presort_cells (typename std::vector &cells, - typename std::map &faces); + presort_cells (std::vector &cells, + std::map &faces); /** * By the resolution of Defect diff --git a/deal.II/deal.II/include/grid/intergrid_map.h b/deal.II/deal.II/include/grid/intergrid_map.h index 0d8686223b..1f5f5b9104 100644 --- a/deal.II/deal.II/include/grid/intergrid_map.h +++ b/deal.II/deal.II/include/grid/intergrid_map.h @@ -206,7 +206,7 @@ class InterGridMap * The actual data. Hold one iterator * for each cell on each level. */ - typename std::vector > mapping; + std::vector > mapping; /** * Store a pointer to the source grid. diff --git a/deal.II/deal.II/include/grid/persistent_tria.h b/deal.II/deal.II/include/grid/persistent_tria.h index 95b62111fb..46c75a9f85 100644 --- a/deal.II/deal.II/include/grid/persistent_tria.h +++ b/deal.II/deal.II/include/grid/persistent_tria.h @@ -214,8 +214,8 @@ class PersistentTriangulation : public Triangulation * is not useful in the context of this * class. */ - virtual void create_triangulation (const typename std::vector > &vertices, - const typename std::vector > &cells, + virtual void create_triangulation (const std::vector > &vertices, + const std::vector > &cells, const SubCellData &subcelldata); /** diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index 490c6452c7..8c1f956e82 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -1851,8 +1851,8 @@ class Triangulation : public TriaDimensionInfo, * and the @ref{GridIn} and * @ref{GridReordering} class. */ - virtual void create_triangulation (const typename std::vector > &vertices, - const typename std::vector > &cells, + virtual void create_triangulation (const std::vector > &vertices, + const std::vector > &cells, const SubCellData &subcelldata); /** @@ -2941,7 +2941,7 @@ class Triangulation : public TriaDimensionInfo, * function * @ref{get_used_vertices}. */ - const typename std::vector > & + const std::vector > & get_vertices () const; /** @@ -3241,13 +3241,13 @@ class Triangulation : public TriaDimensionInfo, * * Usage is like @p{levels[3]->quads}. */ - typename std::vector*> levels; + std::vector*> levels; /** * Array of the vertices of this * triangulation. */ - typename std::vector > vertices; + std::vector > vertices; /** * Array storing a bit-pattern which diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index a4198e6d33..2dad306bba 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -179,7 +179,7 @@ class Boundary : public Subscriptor */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Return equally spaced @@ -213,7 +213,7 @@ class Boundary : public Subscriptor */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normal vectors to @@ -333,7 +333,7 @@ class StraightBoundary : public Boundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Gives @p{n=points.size()=m*m} @@ -349,7 +349,7 @@ class StraightBoundary : public Boundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normals to the 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 fd60b0e5a3..ae737bba24 100644 --- a/deal.II/deal.II/include/grid/tria_boundary_lib.h +++ b/deal.II/deal.II/include/grid/tria_boundary_lib.h @@ -71,7 +71,7 @@ class CylinderBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Refer to the general @@ -84,7 +84,7 @@ class CylinderBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normals to the @@ -135,7 +135,7 @@ class CylinderBoundary : public StraightBoundary * base class. */ void get_intermediate_points_between_points (const Point &p0, const Point &p1, - typename std::vector > &points) const; + std::vector > &points) const; }; @@ -192,7 +192,7 @@ class HyperBallBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Refer to the general @@ -205,7 +205,7 @@ class HyperBallBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normals to the @@ -286,7 +286,7 @@ class HyperBallBoundary : public StraightBoundary * base class. */ void get_intermediate_points_between_points (const Point &p0, const Point &p1, - typename std::vector > &points) const; + std::vector > &points) const; }; @@ -338,7 +338,7 @@ class HalfHyperBallBoundary : public HyperBallBoundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Refer to the general @@ -351,7 +351,7 @@ class HalfHyperBallBoundary : public HyperBallBoundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normals to the @@ -442,7 +442,7 @@ class HalfHyperShellBoundary : public HyperShellBoundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const; + std::vector > &points) const; /** * Refer to the general @@ -455,7 +455,7 @@ class HalfHyperShellBoundary : public HyperShellBoundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const; + std::vector > &points) const; /** * Compute the normals to the diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index 625cb14a84..187eb4e1f0 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -101,7 +101,7 @@ class MGLevelObject : public Subscriptor /** * Array of the objects to be held. */ - typename std::vector objects; + std::vector objects; }; diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 97ab8d0489..570361db70 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -1050,7 +1050,7 @@ class MGDoFHandler : public DoFHandler * are numbers which start from * zero on each level. */ - typename std::vector*> mg_levels; + std::vector*> mg_levels; /** * For each vertex there is a @@ -1059,7 +1059,7 @@ class MGDoFHandler : public DoFHandler * different levels it lives on * and which are these levels. */ - typename std::vector mg_vertex_dofs; + std::vector mg_vertex_dofs; /** * Vectors storing the number of diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 3c80133704..f9a8cda4d2 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -475,13 +475,13 @@ class DataOut_DoFData : public DataOutInterface * List of data elements with vectors of * values for each degree of freedom. */ - typename std::vector dof_data; + std::vector dof_data; /** * List of data elements with vectors of * values for each cell. */ - typename std::vector cell_data; + std::vector cell_data; /** * This is a list of patches that is @@ -490,7 +490,7 @@ class DataOut_DoFData : public DataOutInterface * in the output routines of the base * classes. */ - typename std::vector patches; + std::vector patches; /** * Function by which the base @@ -498,7 +498,7 @@ class DataOut_DoFData : public DataOutInterface * what patches they shall write * to a file. */ - virtual const typename std::vector & + virtual const std::vector & get_patches () const; /** diff --git a/deal.II/deal.II/include/numerics/data_out_stack.h b/deal.II/deal.II/include/numerics/data_out_stack.h index 133acce8fc..b4b47b9a2e 100644 --- a/deal.II/deal.II/include/numerics/data_out_stack.h +++ b/deal.II/deal.II/include/numerics/data_out_stack.h @@ -367,7 +367,7 @@ class DataOutStack : public DataOutInterface * List of patches of all past and * present parameter value data sets. */ - typename std::vector< ::DataOutBase::Patch > patches; + std::vector< ::DataOutBase::Patch > patches; /** * Structure holding data vectors @@ -398,12 +398,12 @@ class DataOutStack : public DataOutInterface /** * List of DoF data vectors. */ - typename std::vector dof_data; + std::vector dof_data; /** * List of cell data vectors. */ - typename std::vector cell_data; + std::vector cell_data; /** * This is the function through @@ -413,7 +413,7 @@ class DataOutStack : public DataOutInterface * the base class @ref{DataOutBase}) to * the actual output function. */ - virtual const typename std::vector< ::DataOutBase::Patch > & get_patches () const; + virtual const std::vector< ::DataOutBase::Patch > & get_patches () const; /** diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index 959d7d3cda..e46880357a 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -484,18 +484,18 @@ class KellyErrorEstimator * index of the solution * vector. */ - typename std::vector > > > psi; + std::vector > > > psi; /** * The same vector for a neighbor cell */ - typename std::vector > > > neighbor_psi; + std::vector > > > neighbor_psi; /** * The normal vectors of the finite * element function on one face */ - typename std::vector > normal_vectors; + std::vector > normal_vectors; /** * Two arrays needed for the diff --git a/deal.II/deal.II/include/numerics/histogram.h b/deal.II/deal.II/include/numerics/histogram.h index 759e1726ea..f6979f3f2d 100644 --- a/deal.II/deal.II/include/numerics/histogram.h +++ b/deal.II/deal.II/include/numerics/histogram.h @@ -109,7 +109,7 @@ class Histogram * on this. */ template - void evaluate (const typename std::vector > &values, + void evaluate (const std::vector > &values, const std::vector &y_values, const unsigned int n_intervals, const IntervalSpacing interval_spacing = linear); diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index 2c3a158c0d..c6c631f0ef 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -410,7 +410,7 @@ class MatrixCreator * Abbreviation for a pair of * iterators. */ - typedef typename std::pair iterator_pair; + typedef std::pair iterator_pair; /** * Constructor. Initialize diff --git a/deal.II/deal.II/include/numerics/solution_transfer.h b/deal.II/deal.II/include/numerics/solution_transfer.h index 4a9c86c9a9..fed9703b9d 100644 --- a/deal.II/deal.II/include/numerics/solution_transfer.h +++ b/deal.II/deal.II/include/numerics/solution_transfer.h @@ -200,7 +200,7 @@ class SolutionTransfer * onto the new (refined and/or * coarsenend) grid. */ - void prepare_for_coarsening_and_refinement (const typename std::vector > &all_in); + void prepare_for_coarsening_and_refinement (const std::vector > &all_in); /** * Same as previous function @@ -264,8 +264,8 @@ class SolutionTransfer * several functions can be * performed in one step. */ - void interpolate (const typename std::vector >&all_in, - typename std::vector > &all_out) const; + void interpolate (const std::vector >&all_in, + std::vector > &all_out) const; /** * Same as the previous function. @@ -392,7 +392,7 @@ class SolutionTransfer unsigned int memory_consumption () const; std::vector *indices_ptr; - typename std::vector > *dof_values_ptr; + std::vector > *dof_values_ptr; }; /** @@ -404,7 +404,7 @@ class SolutionTransfer * collecting all these structures in a vector * helps avoiding fraqmentation of the memory. */ - typename std::vector all_pointerstructs; + std::vector all_pointerstructs; /** * Is used for @@ -413,7 +413,7 @@ class SolutionTransfer * of all cells that'll be coarsened * will be stored in this vector. */ - typename std::vector > > dof_values_on_cell; + std::vector > > dof_values_on_cell; }; diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 640d4593c8..8ef232d15d 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -2368,7 +2368,7 @@ template void DoFTools::map_dofs_to_support_points (const Mapping &mapping, const DoFHandler &dof_handler, - typename std::vector > &support_points) + 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 78fd5c6fe2..e703e0868a 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -327,7 +327,7 @@ bool FiniteElementBase::operator == (const FiniteElementBase &f) const template -const typename std::vector > & +const std::vector > & FiniteElementBase::get_unit_support_points () const { // a finite element may define @@ -352,7 +352,7 @@ FiniteElementBase::has_support_points () const template -const typename std::vector > & +const std::vector > & FiniteElementBase::get_unit_face_support_points () const { // a finite element may define diff --git a/deal.II/deal.II/source/fe/fe_dgp_1d.cc b/deal.II/deal.II/source/fe/fe_dgp_1d.cc index 04828b1536..1a9b149e42 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_1d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_1d.cc @@ -142,12 +142,12 @@ const double * const FE_DGP<1>::Matrices::embedding[][GeometryInfo<1>::children_per_cell] = { {FE_DGP_1d::dgp0_into_dgp0_refined_0, FE_DGP_1d::dgp0_into_dgp0_refined_1}, - {FE_DGP_1d::dgp1_into_dgp1_refined_0, FE_DGP_1d::dgp1_into_dgp1_refined_1}, - {FE_DGP_1d::dgp2_into_dgp2_refined_0, FE_DGP_1d::dgp2_into_dgp2_refined_1}, - {FE_DGP_1d::dgp3_into_dgp3_refined_0, FE_DGP_1d::dgp3_into_dgp3_refined_1}, - {FE_DGP_1d::dgp4_into_dgp4_refined_0, FE_DGP_1d::dgp4_into_dgp4_refined_1}, - {FE_DGP_1d::dgp5_into_dgp5_refined_0, FE_DGP_1d::dgp5_into_dgp5_refined_1}, - {FE_DGP_1d::dgp6_into_dgp6_refined_0, FE_DGP_1d::dgp6_into_dgp6_refined_1} + {FE_DGP_1d::dgp1_into_dgp1_refined_0, FE_DGP_1d::dgp1_into_dgp1_refined_1}, + {FE_DGP_1d::dgp2_into_dgp2_refined_0, FE_DGP_1d::dgp2_into_dgp2_refined_1}, + {FE_DGP_1d::dgp3_into_dgp3_refined_0, FE_DGP_1d::dgp3_into_dgp3_refined_1}, + {FE_DGP_1d::dgp4_into_dgp4_refined_0, FE_DGP_1d::dgp4_into_dgp4_refined_1}, + {FE_DGP_1d::dgp5_into_dgp5_refined_0, FE_DGP_1d::dgp5_into_dgp5_refined_1}, + {FE_DGP_1d::dgp6_into_dgp6_refined_0, FE_DGP_1d::dgp6_into_dgp6_refined_1} }; template <> diff --git a/deal.II/deal.II/source/fe/fe_dgp_2d.cc b/deal.II/deal.II/source/fe/fe_dgp_2d.cc index 1ff47cdd83..ce457e86c1 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_2d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_2d.cc @@ -478,33 +478,33 @@ const double * const FE_DGP<2>::Matrices::embedding[][GeometryInfo<2>::children_per_cell] = { { FE_DGP_2d::dgp0_into_dgp0_refined_0, - FE_DGP_2d::dgp0_into_dgp0_refined_1, - FE_DGP_2d::dgp0_into_dgp0_refined_2, - FE_DGP_2d::dgp0_into_dgp0_refined_3 }, - { FE_DGP_2d::dgp1_into_dgp1_refined_0, - FE_DGP_2d::dgp1_into_dgp1_refined_1, - FE_DGP_2d::dgp1_into_dgp1_refined_2, - FE_DGP_2d::dgp1_into_dgp1_refined_3 }, - { FE_DGP_2d::dgp2_into_dgp2_refined_0, - FE_DGP_2d::dgp2_into_dgp2_refined_1, - FE_DGP_2d::dgp2_into_dgp2_refined_2, - FE_DGP_2d::dgp2_into_dgp2_refined_3 }, - { FE_DGP_2d::dgp3_into_dgp3_refined_0, - FE_DGP_2d::dgp3_into_dgp3_refined_1, - FE_DGP_2d::dgp3_into_dgp3_refined_2, - FE_DGP_2d::dgp3_into_dgp3_refined_3 }, - { FE_DGP_2d::dgp4_into_dgp4_refined_0, - FE_DGP_2d::dgp4_into_dgp4_refined_1, - FE_DGP_2d::dgp4_into_dgp4_refined_2, - FE_DGP_2d::dgp4_into_dgp4_refined_3 }, - { FE_DGP_2d::dgp5_into_dgp5_refined_0, - FE_DGP_2d::dgp5_into_dgp5_refined_1, - FE_DGP_2d::dgp5_into_dgp5_refined_2, - FE_DGP_2d::dgp5_into_dgp5_refined_3 }, - { FE_DGP_2d::dgp6_into_dgp6_refined_0, - FE_DGP_2d::dgp6_into_dgp6_refined_1, - FE_DGP_2d::dgp6_into_dgp6_refined_2, - FE_DGP_2d::dgp6_into_dgp6_refined_3 } + FE_DGP_2d::dgp0_into_dgp0_refined_1, + FE_DGP_2d::dgp0_into_dgp0_refined_2, + FE_DGP_2d::dgp0_into_dgp0_refined_3 }, + { FE_DGP_2d::dgp1_into_dgp1_refined_0, + FE_DGP_2d::dgp1_into_dgp1_refined_1, + FE_DGP_2d::dgp1_into_dgp1_refined_2, + FE_DGP_2d::dgp1_into_dgp1_refined_3 }, + { FE_DGP_2d::dgp2_into_dgp2_refined_0, + FE_DGP_2d::dgp2_into_dgp2_refined_1, + FE_DGP_2d::dgp2_into_dgp2_refined_2, + FE_DGP_2d::dgp2_into_dgp2_refined_3 }, + { FE_DGP_2d::dgp3_into_dgp3_refined_0, + FE_DGP_2d::dgp3_into_dgp3_refined_1, + FE_DGP_2d::dgp3_into_dgp3_refined_2, + FE_DGP_2d::dgp3_into_dgp3_refined_3 }, + { FE_DGP_2d::dgp4_into_dgp4_refined_0, + FE_DGP_2d::dgp4_into_dgp4_refined_1, + FE_DGP_2d::dgp4_into_dgp4_refined_2, + FE_DGP_2d::dgp4_into_dgp4_refined_3 }, + { FE_DGP_2d::dgp5_into_dgp5_refined_0, + FE_DGP_2d::dgp5_into_dgp5_refined_1, + FE_DGP_2d::dgp5_into_dgp5_refined_2, + FE_DGP_2d::dgp5_into_dgp5_refined_3 }, + { FE_DGP_2d::dgp6_into_dgp6_refined_0, + FE_DGP_2d::dgp6_into_dgp6_refined_1, + FE_DGP_2d::dgp6_into_dgp6_refined_2, + FE_DGP_2d::dgp6_into_dgp6_refined_3 } }; template <> diff --git a/deal.II/deal.II/source/fe/fe_dgp_3d.cc b/deal.II/deal.II/source/fe/fe_dgp_3d.cc index cb5a4f892c..80535d21d0 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_3d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_3d.cc @@ -750,45 +750,45 @@ const double * const FE_DGP<3>::Matrices::embedding[][GeometryInfo<3>::children_per_cell] = { { FE_DGP_3d::dgp0_into_dgp0_refined_0, - FE_DGP_3d::dgp0_into_dgp0_refined_1, - FE_DGP_3d::dgp0_into_dgp0_refined_2, - FE_DGP_3d::dgp0_into_dgp0_refined_3, - FE_DGP_3d::dgp0_into_dgp0_refined_4, - FE_DGP_3d::dgp0_into_dgp0_refined_5, - FE_DGP_3d::dgp0_into_dgp0_refined_6, - FE_DGP_3d::dgp0_into_dgp0_refined_7}, - { FE_DGP_3d::dgp1_into_dgp1_refined_0, - FE_DGP_3d::dgp1_into_dgp1_refined_1, - FE_DGP_3d::dgp1_into_dgp1_refined_2, - FE_DGP_3d::dgp1_into_dgp1_refined_3, - FE_DGP_3d::dgp1_into_dgp1_refined_4, - FE_DGP_3d::dgp1_into_dgp1_refined_5, - FE_DGP_3d::dgp1_into_dgp1_refined_6, - FE_DGP_3d::dgp1_into_dgp1_refined_7}, - { FE_DGP_3d::dgp2_into_dgp2_refined_0, - FE_DGP_3d::dgp2_into_dgp2_refined_1, - FE_DGP_3d::dgp2_into_dgp2_refined_2, - FE_DGP_3d::dgp2_into_dgp2_refined_3, - FE_DGP_3d::dgp2_into_dgp2_refined_4, - FE_DGP_3d::dgp2_into_dgp2_refined_5, - FE_DGP_3d::dgp2_into_dgp2_refined_6, - FE_DGP_3d::dgp2_into_dgp2_refined_7}, - { FE_DGP_3d::dgp3_into_dgp3_refined_0, - FE_DGP_3d::dgp3_into_dgp3_refined_1, - FE_DGP_3d::dgp3_into_dgp3_refined_2, - FE_DGP_3d::dgp3_into_dgp3_refined_3, - FE_DGP_3d::dgp3_into_dgp3_refined_4, - FE_DGP_3d::dgp3_into_dgp3_refined_5, - FE_DGP_3d::dgp3_into_dgp3_refined_6, - FE_DGP_3d::dgp3_into_dgp3_refined_7}, - { FE_DGP_3d::dgp4_into_dgp4_refined_0, - FE_DGP_3d::dgp4_into_dgp4_refined_1, - FE_DGP_3d::dgp4_into_dgp4_refined_2, - FE_DGP_3d::dgp4_into_dgp4_refined_3, - FE_DGP_3d::dgp4_into_dgp4_refined_4, - FE_DGP_3d::dgp4_into_dgp4_refined_5, - FE_DGP_3d::dgp4_into_dgp4_refined_6, - FE_DGP_3d::dgp4_into_dgp4_refined_7} + FE_DGP_3d::dgp0_into_dgp0_refined_1, + FE_DGP_3d::dgp0_into_dgp0_refined_2, + FE_DGP_3d::dgp0_into_dgp0_refined_3, + FE_DGP_3d::dgp0_into_dgp0_refined_4, + FE_DGP_3d::dgp0_into_dgp0_refined_5, + FE_DGP_3d::dgp0_into_dgp0_refined_6, + FE_DGP_3d::dgp0_into_dgp0_refined_7}, + { FE_DGP_3d::dgp1_into_dgp1_refined_0, + FE_DGP_3d::dgp1_into_dgp1_refined_1, + FE_DGP_3d::dgp1_into_dgp1_refined_2, + FE_DGP_3d::dgp1_into_dgp1_refined_3, + FE_DGP_3d::dgp1_into_dgp1_refined_4, + FE_DGP_3d::dgp1_into_dgp1_refined_5, + FE_DGP_3d::dgp1_into_dgp1_refined_6, + FE_DGP_3d::dgp1_into_dgp1_refined_7}, + { FE_DGP_3d::dgp2_into_dgp2_refined_0, + FE_DGP_3d::dgp2_into_dgp2_refined_1, + FE_DGP_3d::dgp2_into_dgp2_refined_2, + FE_DGP_3d::dgp2_into_dgp2_refined_3, + FE_DGP_3d::dgp2_into_dgp2_refined_4, + FE_DGP_3d::dgp2_into_dgp2_refined_5, + FE_DGP_3d::dgp2_into_dgp2_refined_6, + FE_DGP_3d::dgp2_into_dgp2_refined_7}, + { FE_DGP_3d::dgp3_into_dgp3_refined_0, + FE_DGP_3d::dgp3_into_dgp3_refined_1, + FE_DGP_3d::dgp3_into_dgp3_refined_2, + FE_DGP_3d::dgp3_into_dgp3_refined_3, + FE_DGP_3d::dgp3_into_dgp3_refined_4, + FE_DGP_3d::dgp3_into_dgp3_refined_5, + FE_DGP_3d::dgp3_into_dgp3_refined_6, + FE_DGP_3d::dgp3_into_dgp3_refined_7}, + { FE_DGP_3d::dgp4_into_dgp4_refined_0, + FE_DGP_3d::dgp4_into_dgp4_refined_1, + FE_DGP_3d::dgp4_into_dgp4_refined_2, + FE_DGP_3d::dgp4_into_dgp4_refined_3, + FE_DGP_3d::dgp4_into_dgp4_refined_4, + FE_DGP_3d::dgp4_into_dgp4_refined_5, + FE_DGP_3d::dgp4_into_dgp4_refined_6, + FE_DGP_3d::dgp4_into_dgp4_refined_7} }; diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 3bbfb5b61a..6c876ce3ec 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -50,7 +50,7 @@ void FETools::get_interpolation_matrix(const FiniteElement &fe1, // Initialize FEValues for fe1 at // the unit support points of the // fe2 element. - const typename std::vector > & + const std::vector > & fe2_support_points = fe2.get_unit_support_points (); Assert(fe2_support_points.size()==fe2.dofs_per_cell, diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index a22829b9ec..41cefe5931 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -145,7 +145,7 @@ FEValuesBase::~FEValuesBase () template template void FEValuesBase::get_function_values (const InputVector &fe_function, - typename std::vector &values) const + std::vector &values) const { Assert (this->update_flags & update_values, ExcAccessToUninitializedField()); Assert (fe->n_components() == 1, @@ -183,7 +183,7 @@ void FEValuesBase::get_function_values (const InputVector &fe_fu template template void FEValuesBase::get_function_values (const InputVector &fe_function, - typename std::vector > &values) const + std::vector > &values) const { Assert (n_quadrature_points == values.size(), ExcWrongVectorSize(values.size(), n_quadrature_points)); @@ -228,7 +228,7 @@ void FEValuesBase::get_function_values (const InputVector template -const typename std::vector > & +const std::vector > & FEValuesBase::get_quadrature_points () const { Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); @@ -252,7 +252,7 @@ template void FEValuesBase:: get_function_grads (const InputVector &fe_function, - typename std::vector > &gradients) const + std::vector > &gradients) const { Assert (this->update_flags & update_gradients, ExcAccessToUninitializedField()); @@ -296,7 +296,7 @@ template void FEValuesBase:: get_function_grads (const InputVector &fe_function, - typename std::vector > > &gradients) const + std::vector > > &gradients) const { Assert (n_quadrature_points == gradients.size(), ExcWrongNoOfComponents()); @@ -352,7 +352,7 @@ template void FEValuesBase:: get_function_2nd_derivatives (const InputVector &fe_function, - typename std::vector > &second_derivatives) const + std::vector > &second_derivatives) const { Assert (fe->n_components() == 1, ExcWrongNoOfComponents()); @@ -395,7 +395,7 @@ template void FEValuesBase:: get_function_2nd_derivatives (const InputVector &fe_function, - typename std::vector > > &second_derivs) const + std::vector > > &second_derivs) const { Assert (n_quadrature_points == second_derivs.size(), ExcWrongNoOfComponents()); @@ -647,7 +647,7 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, template -const typename std::vector > & +const std::vector > & FEFaceValuesBase::get_normal_vectors () const { Assert (this->update_flags & update_normal_vectors, @@ -658,7 +658,7 @@ FEFaceValuesBase::get_normal_vectors () const template -const typename std::vector > & +const std::vector > & FEFaceValuesBase::get_boundary_forms () const { Assert (this->update_flags & update_boundary_forms, diff --git a/deal.II/deal.II/source/fe/mapping_c1.cc b/deal.II/deal.II/source/fe/mapping_c1.cc index 14139d60a5..559ba4ec35 100644 --- a/deal.II/deal.II/source/fe/mapping_c1.cc +++ b/deal.II/deal.II/source/fe/mapping_c1.cc @@ -192,7 +192,7 @@ MappingC1<2>::add_line_support_points (const Triangulation<2>::cell_iterator &ce template void MappingC1::add_line_support_points (const typename Triangulation::cell_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert (false, ExcNotImplemented()); }; @@ -234,7 +234,7 @@ MappingC1<2>::add_quad_support_points (const Triangulation<2>::cell_iterator &, template void MappingC1::add_quad_support_points (const typename Triangulation::cell_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert (false, ExcNotImplemented()); }; diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index b1c4e8facf..c1dac9784e 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, - typename std::vector > &quadrature_points, - typename std::vector > &normal_vectors) const + std::vector > &quadrature_points, + 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, - typename std::vector >& quadrature_points, + std::vector >& quadrature_points, std::vector& JxW_values) const { // convert data object to internal @@ -287,7 +287,7 @@ MappingCartesian::fill_fe_values (const typename DoFHandler::cell_iter // possible InternalData &data = dynamic_cast (mapping_data); - typename std::vector > dummy; + std::vector > dummy; compute_fill (cell, invalid_face_number, invalid_face_number, data, @@ -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, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_forms, - typename std::vector > &normal_vectors) const + std::vector > &boundary_forms, + 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, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &boundary_forms, - typename std::vector > &normal_vectors) const + std::vector > &boundary_forms, + std::vector > &normal_vectors) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 3f5baa1d12..3ac7c02902 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 typename std::vector > &unit_points, +MappingQ::compute_shapes_virtual (const 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, - typename std::vector > &quadrature_points, + 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, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &exterior_forms, - typename std::vector > &normal_vectors) const + std::vector > &exterior_forms, + 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, - typename std::vector > &quadrature_points, + std::vector > &quadrature_points, std::vector &JxW_values, - typename std::vector > &exterior_forms, - typename std::vector > &normal_vectors) const + std::vector > &exterior_forms, + std::vector > &normal_vectors) const { // convert data object to internal // data for this class. fails with @@ -631,7 +631,7 @@ MappingQ::compute_laplace_vector(std::vector > &lvs) co template void MappingQ::apply_laplace_vector(const std::vector > &lvs, - typename std::vector > &a) const + std::vector > &a) const { Assert(lvs.size()!=0, ExcLaplaceVectorNotSet(degree)); const unsigned int n_inner_apply=lvs.size(); @@ -662,7 +662,7 @@ template void MappingQ::compute_mapping_support_points( const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const + std::vector > &a) const { // if this is a cell for which we // want to compute the full @@ -694,7 +694,7 @@ MappingQ::compute_mapping_support_points( template void MappingQ::compute_support_points_laplace(const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const + std::vector > &a) const { // in any case, we need the // vertices first @@ -736,7 +736,7 @@ MappingQ::compute_support_points_laplace(const typename Triangulation: template void MappingQ::compute_support_points_simple(const typename Triangulation::cell_iterator &cell, - typename std::vector > &a) const + std::vector > &a) const { Assert(a.size()==0, ExcInternalError()); // the vertices first @@ -833,7 +833,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, - typename std::vector > &a) const + std::vector > &a) const { static const StraightBoundary straight_boundary; // if we only need the midpoint, @@ -1023,7 +1023,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 &, - typename std::vector > &) const + std::vector > &) const { Assert (dim > 2, ExcImpossibleInDim(dim)); } @@ -1062,7 +1062,7 @@ 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 &, - typename std::vector > &) const + std::vector > &) 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 0046e34a34..e4bb98b2eb 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, - typename std::vector > &a) const + 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 8b6334ecd7..497d6f9e9b 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -848,7 +848,7 @@ void GridGenerator::laplace_transformation (Triangulation<1> &, template void GridGenerator::laplace_transformation (Triangulation &tria, - const typename std::map > &new_points) + const std::map > &new_points) { // first provide everything that is // needed for solving a Laplace diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index cea4f49d8f..eec1d5ff3e 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -419,8 +419,8 @@ void GridIn::skip_comment_lines (std::istream &in, template void -GridIn::delete_unused_vertices (typename std::vector > &vertices, - typename std::vector > &cells, +GridIn::delete_unused_vertices (std::vector > &vertices, + std::vector > &cells, SubCellData &subcelldata) { // first check which vertices are @@ -474,9 +474,9 @@ GridIn::delete_unused_vertices (typename std::vector > &verti template -void GridIn::debug_output_grid (const typename std::vector > &/*cells*/, - const typename std::vector > &/*vertices*/, - std::ostream &/*out*/) +void GridIn::debug_output_grid (const std::vector > &/*cells*/, + const std::vector > &/*vertices*/, + std::ostream &/*out*/) { Assert (false, ExcNotImplemented()); }; diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 27c3bb1ed5..7f3468a47f 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -493,7 +493,7 @@ void GridOut::write_gnuplot (const Triangulation &tria, Quadrature *q_projector=0; if (mapping!=0) { - typename std::vector > boundary_points(n_points); + std::vector > boundary_points(n_points); for (unsigned int i=0; i &tria, // points on a face and // project them onto the // faces of a unit cell - typename std::vector > boundary_points (n_points); + std::vector > boundary_points (n_points); for (unsigned int i=0; i::Cell::count_neighbors () const template void -GridReordering::Cell::insert_faces (typename std::map &/*global_faces*/) +GridReordering::Cell::insert_faces (std::map &/*global_faces*/) { Assert (false, ExcNotImplemented()); }; @@ -730,9 +730,9 @@ GridReordering::FaceData::FaceData () : template inline -void GridReordering::track_back (typename std::vector &cells, - RotationStack &rotation_states, - const unsigned tbtc) +void GridReordering::track_back (std::vector &cells, + RotationStack &rotation_states, + const unsigned tbtc) { unsigned int track_back_to_cell = tbtc; @@ -806,8 +806,8 @@ void GridReordering::track_back (typename std::vector &cells, template -bool GridReordering::try_rotate_single_neighbors (typename std::vector &cells, - RotationStack &rotation_states) +bool GridReordering::try_rotate_single_neighbors (std::vector &cells, + RotationStack &rotation_states) { // the rotation state of the cell // which we try to add by rotating @@ -922,8 +922,8 @@ bool GridReordering::try_rotate_single_neighbors (typename std::vector -void GridReordering::find_reordering (typename std::vector &cells, - typename std::vector > &original_cells, +void GridReordering::find_reordering (std::vector &cells, + std::vector > &original_cells, const std::vector &new_cell_numbers) { // cout << "Starting..." << flush; @@ -1110,8 +1110,8 @@ void GridReordering::find_reordering (typename std::vector template std::vector -GridReordering::presort_cells (typename std::vector &cells, - typename std::map &faces) +GridReordering::presort_cells (std::vector &cells, + std::map &faces) { // first find the cell with the // least neighbors @@ -1264,7 +1264,7 @@ GridReordering::presort_cells (typename std::vector &cells, template -void GridReordering::reorder_cells (typename std::vector > &original_cells) +void GridReordering::reorder_cells (std::vector > &original_cells) { // we need more information than // provided by the input parameter, diff --git a/deal.II/deal.II/source/grid/persistent_tria.cc b/deal.II/deal.II/source/grid/persistent_tria.cc index ca166e9a04..6f58c1f41f 100644 --- a/deal.II/deal.II/source/grid/persistent_tria.cc +++ b/deal.II/deal.II/source/grid/persistent_tria.cc @@ -125,8 +125,8 @@ PersistentTriangulation::copy_triangulation (const Triangulation &old_ template void -PersistentTriangulation::create_triangulation (const typename std::vector > &, - const typename std::vector > &, +PersistentTriangulation::create_triangulation (const std::vector > &, + const std::vector > &, const SubCellData &) { Assert (false, ExcFunctionNotUseful()); diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index fcb0eed869..7a548d8c3f 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -4230,7 +4230,7 @@ Triangulation::n_vertices () const template -const typename std::vector > & +const std::vector > & Triangulation::get_vertices () const { return vertices; diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index c75b4a1b6a..f5b666add7 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 &, - typename std::vector > &) const + std::vector > &) const { Assert (false, ExcPureVirtualFunctionCalled()); }; @@ -55,7 +55,7 @@ template void Boundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert (false, ExcPureVirtualFunctionCalled()); }; @@ -126,7 +126,7 @@ template void StraightBoundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); } @@ -139,7 +139,7 @@ template void StraightBoundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const + std::vector > &points) const { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); @@ -164,7 +164,7 @@ template void StraightBoundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); } @@ -175,7 +175,7 @@ template void StraightBoundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const + std::vector > &points) const { const unsigned int n=points.size(), m=static_cast(std::sqrt(static_cast(n))); 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 6f9ada2841..ca8b11af90 100644 --- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc +++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc @@ -86,7 +86,7 @@ template void CylinderBoundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &line, - typename std::vector > &points) const + std::vector > &points) const { if (points.size()==1) points[0]=get_new_point_on_line(line); @@ -99,7 +99,7 @@ template void CylinderBoundary::get_intermediate_points_between_points ( const Point &v0, const Point &v1, - typename std::vector > &points) const + std::vector > &points) const { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); @@ -166,7 +166,7 @@ template void CylinderBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert(false, Boundary::ExcFunctionNotUseful(dim)); } @@ -303,7 +303,7 @@ template void HyperBallBoundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &line, - typename std::vector > &points) const + std::vector > &points) const { if (points.size()==1) points[0]=get_new_point_on_line(line); @@ -316,7 +316,7 @@ template void HyperBallBoundary::get_intermediate_points_between_points ( const Point &p0, const Point &p1, - typename std::vector > &points) const + std::vector > &points) const { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); @@ -428,7 +428,7 @@ template void HyperBallBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, - typename std::vector > &) const + std::vector > &) const { Assert(false, Boundary::ExcFunctionNotUseful(dim)); } @@ -541,7 +541,7 @@ template void HalfHyperBallBoundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const + std::vector > &points) const { // check whether center of object is // at x==0, since then it belongs @@ -560,7 +560,7 @@ template void HalfHyperBallBoundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const + std::vector > &points) const { // check whether center of object is // at x==0, since then it belongs @@ -709,7 +709,7 @@ template void HalfHyperShellBoundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - typename std::vector > &points) const + std::vector > &points) const { // check whether center of object is // at x==0, since then it belongs @@ -728,7 +728,7 @@ template void HalfHyperShellBoundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - typename std::vector > &points) const + std::vector > &points) const { // check whether center of object is // at x==0, since then it belongs diff --git a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc index 7ab13320c2..c0c2b55226 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc @@ -1768,7 +1768,7 @@ void MGDoFHandler::clear_space () // also delete vector of vertex // indices - typename std::vector tmp; + std::vector tmp; std::swap (mg_vertex_dofs, tmp); }; diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 8ae4f47022..91b3f161b6 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -309,7 +309,7 @@ DataOut_DoFData::get_dataset_names () template -const typename std::vector< ::DataOutBase::Patch > & +const std::vector< ::DataOutBase::Patch > & DataOut_DoFData::get_patches () const { return patches; @@ -478,7 +478,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // clear the patches array if (true) { - typename std::vector< ::DataOutBase::Patch > dummy; + std::vector< ::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index e5cf05e65b..8426765560 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -355,7 +355,7 @@ DataOutStack::memory_consumption () const template -const typename std::vector< ::DataOutBase::Patch > & +const std::vector< ::DataOutBase::Patch > & DataOutStack::get_patches () const { return patches; diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc index 1e73462046..94b240d4ef 100644 --- a/deal.II/deal.II/source/numerics/histogram.cc +++ b/deal.II/deal.II/source/numerics/histogram.cc @@ -49,20 +49,20 @@ Histogram::Interval::memory_consumption () const template -void Histogram::evaluate (const typename std::vector > &values, - const std::vector &_y_values, - const unsigned int n_intervals, - const IntervalSpacing interval_spacing) +void Histogram::evaluate (const std::vector > &values, + const std::vector &y_values_, + const unsigned int n_intervals, + const IntervalSpacing interval_spacing) { Assert (values.size() > 0, ExcEmptyData()); Assert (n_intervals > 0, ExcInvalidIntervals()); for (unsigned int i=0; i 0, ExcEmptyData()); - Assert (values.size() == _y_values.size(), - ExcIncompatibleArraySize(values.size(), _y_values.size())); + Assert (values.size() == y_values_.size(), + ExcIncompatibleArraySize(values.size(), y_values_.size())); // store y_values - y_values = _y_values; + y_values = y_values_; // first find minimum and maximum value // in the indicators diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index 120a56b6b6..0b819826b8 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -151,7 +151,7 @@ void SolutionTransfer::refine_interpolate (Vector &vec) con template void SolutionTransfer:: -prepare_for_coarsening_and_refinement(const typename std::vector > &all_in) +prepare_for_coarsening_and_refinement(const std::vector > &all_in) { Assert(prepared_for!=pure_refinement, ExcAlreadyPrepForRef()); Assert(!prepared_for!=coarsening_and_refinement, @@ -277,8 +277,8 @@ SolutionTransfer::prepare_for_coarsening_and_refinement(const Vecto template void SolutionTransfer:: -interpolate (const typename std::vector > &all_in, - typename std::vector > &all_out) const +interpolate (const std::vector > &all_in, + std::vector > &all_out) const { Assert(prepared_for==coarsening_and_refinement, ExcNotPrepared()); for (unsigned int i=0; i &mapping, // avoided to evaluate // the vectorfunction multiply at // the same point on a cell. - const typename std::vector > & + const std::vector > & unit_support_points = fe.get_unit_support_points(); Assert (unit_support_points.size() != 0, ExcNonInterpolatingFE()); @@ -815,7 +815,7 @@ VectorTools::interpolate_boundary_values (const Mapping &mapping // support points. this wil be used // to obtain the quadrature points // on the real cell's face - const typename std::vector > + const std::vector > & unit_support_points = fe.get_unit_face_support_points(); // check whether there are support diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h index 476f6245af..0a1abdc3c9 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.h @@ -545,7 +545,7 @@ class BlockSparseMatrix : public Subscriptor /** * Array of sub-matrices. */ - typename std::vector > > > sub_objects; + 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 25d324f568..304e73d5b4 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -358,7 +358,7 @@ class BlockSparsityPatternBase : public Subscriptor /** * Array of sparsity patterns. */ - typename std::vector > > sub_objects; + std::vector > > sub_objects; /** * Object storing and managing diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h index 448fb4963e..1846876ebf 100644 --- a/deal.II/lac/include/lac/block_vector.h +++ b/deal.II/lac/include/lac/block_vector.h @@ -1127,7 +1127,7 @@ class BlockVector /** * Pointer to the array of components. */ - typename std::vector > components; + std::vector > components; /** * Object managing the diff --git a/deal.II/lac/include/lac/filtered_matrix.h b/deal.II/lac/include/lac/filtered_matrix.h index 9506957fb8..cda7e2d676 100644 --- a/deal.II/lac/include/lac/filtered_matrix.h +++ b/deal.II/lac/include/lac/filtered_matrix.h @@ -205,7 +205,7 @@ class FilteredMatrix : public Subscriptor * freedom index and the value it * shall have. */ - typedef typename std::pair IndexValuePair; + typedef std::pair IndexValuePair; /** * Default constructor. You will @@ -488,7 +488,7 @@ class FilteredMatrix : public Subscriptor * the value to which it shall be * fixed. */ - typename std::vector constraints; + std::vector constraints; /** * Vector to be used as temporary @@ -561,7 +561,7 @@ class FilteredMatrix : public Subscriptor * matrix types. */ void get_column_entries (const unsigned int index, - typename std::vector &column_entries, + std::vector &column_entries, const bool matrix_is_symmetric) const; }; diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 2f6ad1bdd7..40295cbe93 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -712,7 +712,8 @@ FullMatrix::print (std::ostream &s, template template void -FullMatrix::add (const number s,const FullMatrix& src) +FullMatrix::add (const number s, + const FullMatrix &src) { Assert (this->data() != 0, ExcEmptyMatrix()); diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h index 475a6b1a7d..c00ae7f564 100644 --- a/deal.II/lac/include/lac/precondition_block.h +++ b/deal.II/lac/include/lac/precondition_block.h @@ -268,7 +268,7 @@ class PreconditionBlock : public virtual Subscriptor * memory in comparison with * @p{inverse_type=double}. */ - typename std::vector > var_inverse; + std::vector > var_inverse; /** * Storage of the original diagonal blocks. @@ -277,7 +277,7 @@ class PreconditionBlock : public virtual Subscriptor * * Used by the blocked SSOR method. */ - typename std::vector > var_diagonal; + std::vector > var_diagonal; /** * Flag for diagonal compression. diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.h b/deal.II/lac/include/lac/sparse_matrix_ez.h index f8d5eaf340..a7956b0e9a 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.h @@ -754,7 +754,7 @@ class SparseMatrixEZ : public Subscriptor * entries of a row ordered * by column number. */ - typename std::vector values; + std::vector values; }; diff --git a/deal.II/lac/include/lac/sparsity_pattern.h b/deal.II/lac/include/lac/sparsity_pattern.h index 0ca2d58a46..f32db1fa57 100644 --- a/deal.II/lac/include/lac/sparsity_pattern.h +++ b/deal.II/lac/include/lac/sparsity_pattern.h @@ -969,7 +969,7 @@ class SparsityPattern : public Subscriptor */ template unsigned int - get_column_index_from_iterator (const typename std::pair &i); + get_column_index_from_iterator (const std::pair &i); /** * Likewise, but sometimes needed @@ -980,7 +980,7 @@ class SparsityPattern : public Subscriptor */ template unsigned int - get_column_index_from_iterator (const typename std::pair &i); + get_column_index_from_iterator (const std::pair &i); /** * Make all sparse matrices @@ -1170,7 +1170,8 @@ SparsityPattern::get_column_index_from_iterator (const unsigned int i) template inline unsigned int -SparsityPattern::get_column_index_from_iterator (const typename std::pair &i) +SparsityPattern:: +get_column_index_from_iterator (const std::pair &i) { return i.first; }; @@ -1180,7 +1181,7 @@ SparsityPattern::get_column_index_from_iterator (const typename std::pair inline unsigned int -SparsityPattern::get_column_index_from_iterator (const typename std::pair &i) +SparsityPattern::get_column_index_from_iterator (const std::pair &i) { return i.first; }; diff --git a/deal.II/lac/include/lac/vector_memory.h b/deal.II/lac/include/lac/vector_memory.h index b1c2debc3d..0e1aacc495 100644 --- a/deal.II/lac/include/lac/vector_memory.h +++ b/deal.II/lac/include/lac/vector_memory.h @@ -155,12 +155,12 @@ class GrowingVectorMemory : public VectorMemory * vector is used, second the * vector itself. */ - typedef typename std::pair entry_type; + typedef std::pair entry_type; /** * Array of allocated vectors. */ - typename std::vector pool; + std::vector pool; /** * Overall number of allocations.