From: third-party Date: Mon, 22 Jan 2001 10:25:13 +0000 (+0000) Subject: Add std:: prefices. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de1cb3e40d238d68dfa87152c330dd50b42c9cd;p=dealii-svn.git Add std:: prefices. git-svn-id: https://svn.dealii.org/trunk@3750 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/polynomial.h b/deal.II/base/include/base/polynomial.h index 9401e01006..445f31df5c 100644 --- a/deal.II/base/include/base/polynomial.h +++ b/deal.II/base/include/base/polynomial.h @@ -48,7 +48,7 @@ class Polynomial : public Subscriptor * the @p{coefficient} array * minus one. */ - Polynomial (const vector &coefficients); + Polynomial (const std::vector &coefficients); /** * Default-Constructor. @@ -81,8 +81,8 @@ class Polynomial : public Subscriptor * scheme for numerical stability * of the evaluation. */ - void value (const double x, - vector &values) const; + void value (const double x, + std::vector &values) const; /** * Exception @@ -104,7 +104,7 @@ class Polynomial : public Subscriptor * passed down by derived * classes. */ - vector coefficients; + std::vector coefficients; }; @@ -162,7 +162,7 @@ class LagrangeEquidistant: public Polynomial * constructor. */ static - vector + std::vector compute_coefficients (const unsigned int n, const unsigned int support_point); }; diff --git a/deal.II/base/include/base/tensor_product_polynomials.h b/deal.II/base/include/base/tensor_product_polynomials.h index 0871eafdcb..8827888568 100644 --- a/deal.II/base/include/base/tensor_product_polynomials.h +++ b/deal.II/base/include/base/tensor_product_polynomials.h @@ -43,7 +43,7 @@ class TensorProductPolynomials * and will be copied into the * member variable @p{polynomials}. */ - TensorProductPolynomials(const vector > &pols); + TensorProductPolynomials(const std::vector > &pols); /** * Calculates the polynomials @@ -56,10 +56,10 @@ class TensorProductPolynomials * case, the function will not * compute these values. */ - void compute (const Point &unit_point, - vector &values, - vector > &grads, - vector > &grad_grads) const; + void compute (const Point &unit_point, + std::vector &values, + typename std::vector > &grads, + typename std::vector > &grad_grads) const; /** * Returns the number of tensor @@ -81,7 +81,7 @@ class TensorProductPolynomials * Pointer to the @p{polynomials} * given to the constructor. */ - vector > polynomials; + std::vector > polynomials; /** * Number of tensor product diff --git a/deal.II/base/source/polynomial.cc b/deal.II/base/source/polynomial.cc index 419ebe72be..7ea2e58a8f 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -15,7 +15,7 @@ #include -Polynomial::Polynomial (const vector &a): +Polynomial::Polynomial (const std::vector &a): coefficients(a) {} @@ -43,8 +43,8 @@ double Polynomial::value (const double x) const -void Polynomial::value (const double x, - vector &values) const +void Polynomial::value (const double x, + std::vector &values) const { Assert (coefficients.size() > 0, ExcVoidPolynomial()); Assert (values.size() > 0, ExcEmptyArray()); @@ -68,7 +68,7 @@ void Polynomial::value (const double x, // then do it properly by the // full Horner scheme const unsigned int m=coefficients.size(); - vector a(coefficients); + std::vector a(coefficients); unsigned int j_faculty=1; for (unsigned int j=0; j +std::vector LagrangeEquidistant::compute_coefficients (const unsigned int n, const unsigned int support_point) { - vector a (n+1); + std::vector a (n+1); Assert(support_point TensorProductPolynomials::TensorProductPolynomials( - const vector > &pols): + const std::vector > &pols): polynomials(pols), n_tensor_pols(power(polynomials.size(), dim)) {} @@ -38,13 +38,13 @@ TensorProductPolynomials::TensorProductPolynomials( template void TensorProductPolynomials::compute( - const Point &p, - vector &values, - vector > &grads, - vector > &grad_grads) const + const Point &p, + std::vector &values, + typename std::vector > &grads, + typename std::vector > &grad_grads) const { unsigned int n_pols=polynomials.size(); - vector n_pols_to(dim+1); + std::vector n_pols_to(dim+1); n_pols_to[0]=1; for (unsigned int i=0; i::compute( v_size=3; } - vector > > v( - dim, vector > (n_pols, vector (v_size))); + std::vector > > v( + dim, std::vector > (n_pols, std::vector (v_size))); for (unsigned int d=0; d > &v_d=v[d]; + std::vector > &v_d=v[d]; Assert(v_d.size()==n_pols, ExcInternalError()); for (unsigned int i=0; ivalue(p(d), v_d[i]);