From a7c64ba5ed1efd7e56bdbd580b0215fab4278b06 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 3 Mar 2004 23:27:09 +0000 Subject: [PATCH] Fix for icc6 git-svn-id: https://svn.dealii.org/trunk@8652 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/source/dofs/dof_constraints.cc | 21 ++++++++----------- .../source/numerics/error_estimator.cc | 14 ++++++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index d51dbc3e99..a3de04de20 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -1243,22 +1243,19 @@ ConstraintMatrix::memory_consumption () const // explicit instantiations // -// define a list of functions for vectors and matrices, respectively, -// where the vector/matrix can be replaced using a preprocessor -// variable VectorType/MatrixType. note that we cannot do so by using -// a preprocessor function with one arg, since -// #vector_functions(BlockVector)# is not recognized as one -// arg, and putting parentheses around the arg yields incorrect -// syntax... +// define a list of functions for vectors and matrices, respectively, where +// the vector/matrix can be replaced using a preprocessor variable +// VectorType/MatrixType. note that we need a space between "VectorType" and +// ">" to disambiguate ">>" when VectorType trails in an angle bracket #define VECTOR_FUNCTIONS(VectorType) \ - template void ConstraintMatrix::condense(const VectorType &uncondensed,\ + template void ConstraintMatrix::condense(const VectorType &uncondensed,\ VectorType &condensed) const;\ - template void ConstraintMatrix::condense(VectorType &vec) const;\ - template void ConstraintMatrix::set_zero(VectorType &vec) const;\ - template void ConstraintMatrix::distribute(const VectorType &condensed,\ + template void ConstraintMatrix::condense(VectorType &vec) const;\ + template void ConstraintMatrix::set_zero(VectorType &vec) const;\ + template void ConstraintMatrix::distribute(const VectorType &condensed,\ VectorType &uncondensed) const;\ - template void ConstraintMatrix::distribute(VectorType &vec) const + template void ConstraintMatrix::distribute(VectorType &vec) const VECTOR_FUNCTIONS(Vector); diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index bdf6f80c96..150d438348 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -1155,12 +1155,16 @@ integrate_over_irregular_face (const DoFHandler &dof_handler, // explicit instantiations template class KellyErrorEstimator; -// instantiate the externally visible functions +// instantiate the externally visible functions. define a list of functions +// for vectors, where the vector/matrix can be replaced using a preprocessor +// variable VectorType/MatrixType. note that we need a space between +// "VectorType" and ">" to disambiguate ">>" when VectorType trails in an +// angle bracket #define INSTANTIATE(InputVector) \ template \ void \ KellyErrorEstimator:: \ -estimate (const Mapping &, \ +estimate (const Mapping &, \ const DoFHandler &, \ const Quadrature &, \ const FunctionMap::type &, \ @@ -1173,7 +1177,7 @@ estimate (const Mapping &, \ template \ void \ KellyErrorEstimator:: \ -estimate (const DoFHandler &, \ +estimate (const DoFHandler &, \ const Quadrature &, \ const FunctionMap::type &, \ const InputVector &, \ @@ -1185,7 +1189,7 @@ estimate (const DoFHandler &, \ template \ void \ KellyErrorEstimator:: \ -estimate (const Mapping &, \ +estimate (const Mapping &, \ const DoFHandler &, \ const Quadrature &, \ const FunctionMap::type &, \ @@ -1198,7 +1202,7 @@ estimate (const Mapping &, \ template \ void \ KellyErrorEstimator:: \ -estimate (const DoFHandler &, \ +estimate (const DoFHandler &, \ const Quadrature &, \ const FunctionMap::type &, \ const std::vector &, \ -- 2.39.5