From: kanschat Date: Wed, 30 Nov 2011 21:09:04 +0000 (+0000) Subject: fix linking problem X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c098f366841fa38b361886c2b362b1fa94575cc6;p=dealii-svn.git fix linking problem git-svn-id: https://svn.dealii.org/trunk@24783 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/lac/constraint_matrix.cc b/deal.II/source/lac/constraint_matrix.cc index e0db3731b7..3a7d1f30d8 100644 --- a/deal.II/source/lac/constraint_matrix.cc +++ b/deal.II/source/lac/constraint_matrix.cc @@ -2279,8 +2279,10 @@ ConstraintMatrix::memory_consumption () const VECTOR_FUNCTIONS(Vector); VECTOR_FUNCTIONS(Vector); -VECTOR_FUNCTIONS(BlockVector); +VECTOR_FUNCTIONS(Vector); VECTOR_FUNCTIONS(BlockVector); +VECTOR_FUNCTIONS(BlockVector); +VECTOR_FUNCTIONS(BlockVector); // TODO: Can PETSc really do all the operations required by the above // condense/distribute function etc also on distributed vectors? Trilinos diff --git a/deal.II/source/multigrid/mg_transfer_prebuilt.inst.in b/deal.II/source/multigrid/mg_transfer_prebuilt.inst.in index 3fb5cdb843..f2bd460769 100644 --- a/deal.II/source/multigrid/mg_transfer_prebuilt.inst.in +++ b/deal.II/source/multigrid/mg_transfer_prebuilt.inst.in @@ -11,23 +11,23 @@ //--------------------------------------------------------------------------- -for (deal_II_dimension : DIMENSIONS; V1 : SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; V1 : DEAL_II_VEC_TEMPLATES; S1 : REAL_SCALARS) { template - void MGTransferPrebuilt::build_matrices( + void MGTransferPrebuilt >::build_matrices( const MGDoFHandler &mg_dof); } -for (deal_II_dimension : DIMENSIONS; V1,V2 : SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; V1,V2 : DEAL_II_VEC_TEMPLATES; S1, S2 : REAL_SCALARS) { template void - MGTransferPrebuilt::copy_to_mg ( - const MGDoFHandler&, MGLevelObject&, const V2&) const; + MGTransferPrebuilt >::copy_to_mg ( + const MGDoFHandler&, MGLevelObject >&, const V2&) const; template void - MGTransferPrebuilt::copy_from_mg (const MGDoFHandler&, V2&, - const MGLevelObject&) const; + MGTransferPrebuilt >::copy_from_mg (const MGDoFHandler&, V2&, + const MGLevelObject >&) const; template void - MGTransferPrebuilt::copy_from_mg_add (const MGDoFHandler&, V2&, - const MGLevelObject&) const; + MGTransferPrebuilt >::copy_from_mg_add (const MGDoFHandler&, V2&, + const MGLevelObject >&) const; }