From 95a46dd6053e203308ab1ff80a79de36fffe4b69 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 11 Apr 2002 15:52:32 +0000 Subject: [PATCH] More such places: ISO C++ requires that we explicitly state which template to instantiate in case there are ambiguities. git-svn-id: https://svn.dealii.org/trunk@5650 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/source/dofs/dof_constraints.cc | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index de38abb825..f5cc6b33fe 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -1212,11 +1212,6 @@ ConstraintMatrix::memory_consumption () const -#define matrix_functions_1 \ - template void ConstraintMatrix::condense<>(const MatrixType &uncondensed,\ - MatrixType &condensed) const; -#define matrix_functions_2 \ - template void ConstraintMatrix::condense<>(MatrixType &uncondensed) const; @@ -1234,17 +1229,13 @@ vector_functions; -#define MatrixType SparseMatrix -matrix_functions_1; -matrix_functions_2; -#undef MatrixType +template void ConstraintMatrix::condense(const SparseMatrix &uncondensed, + SparseMatrix &condensed) const; +template void ConstraintMatrix::condense(SparseMatrix &uncondensed) const; -#define MatrixType SparseMatrix -matrix_functions_1; -matrix_functions_2; -#undef MatrixType +template void ConstraintMatrix::condense(const SparseMatrix &uncondensed, + SparseMatrix &condensed) const; +template void ConstraintMatrix::condense(SparseMatrix &uncondensed) const; // block sparse matrices are only implemented for one of the two matrix functions -#define MatrixType BlockSparseMatrix -matrix_functions_2; -#undef MatrixType +template void ConstraintMatrix::condense(BlockSparseMatrix &uncondensed) const; -- 2.39.5