From 2251b1b431486f7711b26a81af0c5994017b22ec Mon Sep 17 00:00:00 2001 From: heltai Date: Thu, 25 Dec 2008 10:38:23 +0000 Subject: [PATCH] Fixed multiple instantiations when both 1d and 2d libs are linked against a program. git-svn-id: https://svn.dealii.org/trunk@18011 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_tools.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 361c3c0ff6..76cf999ff3 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -560,7 +560,7 @@ FETools::compute_node_matrix( } } -#if deal_II_dimension != 3 +#if deal_II_dimension == 1 template<> void FETools::compute_embedding_matrices(const FiniteElement<1,2> &, @@ -570,6 +570,7 @@ FETools::compute_embedding_matrices(const FiniteElement<1,2> &, Assert(false, ExcNotImplemented()); } +#elif deal_II_dimension == 2 template<> void FETools::compute_embedding_matrices(const FiniteElement<2,3>&, @@ -873,7 +874,7 @@ FETools::compute_face_embedding_matrices(const FiniteElement& fe, } } -#if deal_II_dimension != 3 +#if deal_II_dimension == 1 template <> void FETools::compute_projection_matrices(const FiniteElement<1,2>&, @@ -882,6 +883,7 @@ FETools::compute_projection_matrices(const FiniteElement<1,2>&, Assert(false, ExcNotImplemented()); } +#elif deal_II_dimension == 2 template <> void FETools::compute_projection_matrices(const FiniteElement<2,3>&, -- 2.39.5