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

diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc
index de38abb82535bc11208525d3e93a272475ceb587..f5cc6b33fe70b160084107759cd53b57030678c6 100644 (file)
--- 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<float>
-matrix_functions_1;
-matrix_functions_2;
-#undef MatrixType
+template void ConstraintMatrix::condense<float>(const SparseMatrix<float> &uncondensed,
+                                               SparseMatrix<float> &condensed) const;
+template void ConstraintMatrix::condense<float>(SparseMatrix<float> &uncondensed) const;
 
-#define MatrixType SparseMatrix<double>
-matrix_functions_1;
-matrix_functions_2;
-#undef MatrixType
+template void ConstraintMatrix::condense<double>(const SparseMatrix<double> &uncondensed,
+                                                SparseMatrix<double> &condensed) const;
+template void ConstraintMatrix::condense<double>(SparseMatrix<double> &uncondensed) const;
 
 // block sparse matrices are only implemented for one of the two matrix functions
-#define MatrixType BlockSparseMatrix<double>
-matrix_functions_2;
-#undef MatrixType
+template void ConstraintMatrix::condense<double>(BlockSparseMatrix<double> &uncondensed) const;