From 2209b28036e14a6df4adfd1aa783f350f4cc9746 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Dec 2014 18:32:48 -0600 Subject: [PATCH] Fix missing instantiations. --- .../deal.II/numerics/vector_tools.templates.h | 2 +- .../numerics/vector_tools_interpolate.inst.in | 39 ++++--------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index 3ecba373b0..188d615ad3 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -602,7 +602,7 @@ namespace VectorTools Assert(u2.size()==dof2.n_dofs(), ExcDimensionMismatch(u2.size(),dof2.n_dofs())); - Vector cache; + dealii::Vector cache; // Looping over the finest common // mesh, this means that source and diff --git a/source/numerics/vector_tools_interpolate.inst.in b/source/numerics/vector_tools_interpolate.inst.in index 1da0f724dd..5430ee6abc 100644 --- a/source/numerics/vector_tools_interpolate.inst.in +++ b/source/numerics/vector_tools_interpolate.inst.in @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1998 - 2013 by the deal.II authors +// Copyright (C) 1998 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -85,53 +85,30 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens } -for (deal_II_dimension : DIMENSIONS) +for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { namespace VectorTools \{ template void interpolate_to_different_mesh (const DoFHandler &, - const Vector &, + const VEC &, const DoFHandler &, - Vector &); + VEC &); template void interpolate_to_different_mesh (const DoFHandler &, - const Vector &, + const VEC &, const DoFHandler &, const ConstraintMatrix &, - Vector &); + VEC &); template void interpolate_to_different_mesh (const InterGridMap > &, - const Vector &, + const VEC &, const ConstraintMatrix &, - Vector &); - - template - void interpolate_to_different_mesh - (const DoFHandler &, - const Vector &, - const DoFHandler &, - Vector &); - - template - void interpolate_to_different_mesh - (const DoFHandler &, - const Vector &, - const DoFHandler &, - const ConstraintMatrix &, - Vector &); - - template - void interpolate_to_different_mesh - (const InterGridMap > &, - const Vector &, - const ConstraintMatrix &, - Vector &); - + VEC &); \} } -- 2.39.5