From 86a88a9718f8a0d1e37c3c796f1068f5995ddd2c Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 4 Feb 2002 17:28:27 +0000 Subject: [PATCH] Fix a number of problems that appeared with Intels icc compiler. git-svn-id: https://svn.dealii.org/trunk@5470 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/function_lib.h | 6 +++--- deal.II/base/include/base/quadrature_lib.h | 2 +- deal.II/base/source/function_lib_cutoff.cc | 6 +++--- deal.II/base/source/parameter_handler.cc | 4 ++++ deal.II/base/source/quadrature_lib.cc | 2 +- deal.II/deal.II/include/grid/grid_out.h | 4 ++-- deal.II/deal.II/source/fe/fe_dgq.cc | 2 +- deal.II/lac/source/block_vector.cc | 16 ++++++++-------- deal.II/lac/source/vector.cc | 16 ++++++++-------- deal.II/lac/source/vector.long_double.cc | 20 ++++++++++---------- 10 files changed, 41 insertions(+), 37 deletions(-) diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index 30374dbe67..06345b2564 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -809,7 +809,7 @@ namespace Functions * only. */ CutOffFunctionLinfty (const double radius = 1., - Point = Point(), + const Point = Point(), const unsigned int n_components = 1, const unsigned int select = no_component); @@ -880,7 +880,7 @@ namespace Functions * component only. */ CutOffFunctionW1 (const double radius = 1., - Point = Point(), + const Point = Point(), const unsigned int n_components = 1, const unsigned int select = no_component); @@ -953,7 +953,7 @@ namespace Functions * component only. */ CutOffFunctionCinfty (const double radius = 1., - Point = Point(), + const Point = Point(), const unsigned int n_components = 1, const unsigned int select = no_component); diff --git a/deal.II/base/include/base/quadrature_lib.h b/deal.II/base/include/base/quadrature_lib.h index 7c45b5c64f..21b4382ef9 100644 --- a/deal.II/base/include/base/quadrature_lib.h +++ b/deal.II/base/include/base/quadrature_lib.h @@ -203,7 +203,7 @@ class QWeddle : public Quadrature /* -------------- declaration of explicit specializations ------------- */ -template <> QGauss<1>::QGauss (unsigned int n); +template <> QGauss<1>::QGauss (const unsigned int n); template <> QGauss2<1>::QGauss2 (); template <> QGauss3<1>::QGauss3 (); template <> QGauss4<1>::QGauss4 (); diff --git a/deal.II/base/source/function_lib_cutoff.cc b/deal.II/base/source/function_lib_cutoff.cc index a872a1c07e..3270004be8 100644 --- a/deal.II/base/source/function_lib_cutoff.cc +++ b/deal.II/base/source/function_lib_cutoff.cc @@ -44,7 +44,7 @@ namespace Functions CutOffFunctionLinfty::CutOffFunctionLinfty (const double r, const Point p, const unsigned int n_components, - unsigned int select) + const unsigned int select) : Function (n_components), center(p), @@ -111,7 +111,7 @@ namespace Functions CutOffFunctionW1::CutOffFunctionW1 (const double r, const Point p, const unsigned int n_components, - unsigned int select) + const unsigned int select) : Function (n_components), center(p), @@ -183,7 +183,7 @@ namespace Functions CutOffFunctionCinfty::CutOffFunctionCinfty (const double r, const Point p, const unsigned int n_components, - unsigned int select) + const unsigned int select) : Function (n_components), center(p), diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 41c90d17aa..a6f71755e8 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -30,6 +30,10 @@ # include #endif +#ifdef HAVE_STD_NUMERIC_LIMITS +# include +#endif + namespace Patterns { diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index e14aa19995..9e1950e1fe 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -358,7 +358,7 @@ QWeddle<1>::QWeddle () : // tensor product of lower dimensions template -QGauss::QGauss (unsigned int n) +QGauss::QGauss (const unsigned int n) : Quadrature (QGauss(n), QGauss<1>(n)) {}; diff --git a/deal.II/deal.II/include/grid/grid_out.h b/deal.II/deal.II/include/grid/grid_out.h index 568287bbb1..3ef69a2a94 100644 --- a/deal.II/deal.II/include/grid/grid_out.h +++ b/deal.II/deal.II/include/grid/grid_out.h @@ -54,8 +54,8 @@ namespace GridOutFlags /** * Constructor. */ - DX (bool write_faces = false, - bool write_all_faces = false); + DX (const bool write_faces = false, + const bool write_all_faces = false); }; /** diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index ab1e2c1be2..2d6abc635a 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -585,7 +585,7 @@ FE_DGQ::base_element (const unsigned int index) const template bool -FE_DGQ::has_support_on_face (unsigned int shape_index, +FE_DGQ::has_support_on_face (const unsigned int shape_index, const unsigned int face_index) const { diff --git a/deal.II/lac/source/block_vector.cc b/deal.II/lac/source/block_vector.cc index 27b9d16c21..0a5315a499 100644 --- a/deal.II/lac/source/block_vector.cc +++ b/deal.II/lac/source/block_vector.cc @@ -17,18 +17,18 @@ template class BlockVector; template BlockVector& BlockVector::operator=( const BlockVector&); -template void BlockVector::reinit(const BlockVector&, bool); -template void BlockVector::reinit(const BlockVector&, bool); -template void BlockVector::equ(double, const BlockVector&); -template void BlockVector::equ(double, const BlockVector&); +template void BlockVector::reinit(const BlockVector&, const bool); +template void BlockVector::reinit(const BlockVector&, const bool); +template void BlockVector::equ(const double, const BlockVector&); +template void BlockVector::equ(const double, const BlockVector&); template class BlockVector; template BlockVector& BlockVector::operator=( const BlockVector&); -template void BlockVector::reinit(const BlockVector&, bool); -template void BlockVector::reinit(const BlockVector&, bool); -template void BlockVector::equ(float, const BlockVector&); -template void BlockVector::equ(float, const BlockVector&); +template void BlockVector::reinit(const BlockVector&, const bool); +template void BlockVector::reinit(const BlockVector&, const bool); +template void BlockVector::equ(const float, const BlockVector&); +template void BlockVector::equ(const float, const BlockVector&); namespace BlockVectorIterators { diff --git a/deal.II/lac/source/vector.cc b/deal.II/lac/source/vector.cc index 391ac3c009..8fad192863 100644 --- a/deal.II/lac/source/vector.cc +++ b/deal.II/lac/source/vector.cc @@ -19,19 +19,19 @@ template class Vector; template Vector& Vector::operator=(const Vector&); template double Vector::operator*(const Vector&) const; template double Vector::operator*(const Vector&) const; -template void Vector::reinit(const Vector&, bool); -template void Vector::reinit(const Vector&, bool); -template void Vector::equ(double, const Vector&); -template void Vector::equ(double, const Vector&); +template void Vector::reinit(const Vector&, const bool); +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const double, const Vector&); +template void Vector::equ(const double, const Vector&); template class Vector; template Vector& Vector::operator=(const Vector&); template float Vector::operator*(const Vector&) const; template float Vector::operator*(const Vector&) const; -template void Vector::reinit(const Vector&, bool); -template void Vector::reinit(const Vector&, bool); -template void Vector::equ(float, const Vector&); -template void Vector::equ(float, const Vector&); +template void Vector::reinit(const Vector&, const bool); +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const float, const Vector&); +template void Vector::equ(const float, const Vector&); // see the .h file for why these functions are disabled. // template Vector::Vector (const Vector& v); diff --git a/deal.II/lac/source/vector.long_double.cc b/deal.II/lac/source/vector.long_double.cc index 1b4285588e..3567be1883 100644 --- a/deal.II/lac/source/vector.long_double.cc +++ b/deal.II/lac/source/vector.long_double.cc @@ -22,22 +22,22 @@ template Vector& Vector::operator=(const Vector template long double Vector::operator * (const Vector &) const; template long double Vector::operator * (const Vector &) const; template long double Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, bool); -template void Vector::reinit(const Vector&, bool); -template void Vector::reinit(const Vector&, bool); -template void Vector::equ(long double, const Vector&); -template void Vector::equ(long double, const Vector&); -template void Vector::equ(long double, const Vector&); +template void Vector::reinit(const Vector&, const bool); +template void Vector::reinit(const Vector&, const bool); +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const long double, const Vector&); +template void Vector::equ(const long double, const Vector&); +template void Vector::equ(const long double, const Vector&); template Vector& Vector::operator=(const Vector&); template double Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, bool); -template void Vector::equ(double, const Vector&); +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const double, const Vector&); template Vector& Vector::operator=(const Vector&); template float Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, bool); -template void Vector::equ(float, const Vector&); +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const float, const Vector&); // see the .h file for why these functions are disabled. // template Vector::Vector (const Vector& v); -- 2.39.5