]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed multiple instantiations when both 1d and 2d libs are linked against a program.
authorheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 25 Dec 2008 10:38:23 +0000 (10:38 +0000)
committerheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 25 Dec 2008 10:38:23 +0000 (10:38 +0000)
git-svn-id: https://svn.dealii.org/trunk@18011 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe_tools.cc

index 361c3c0ff6c4d48b4b7fc04ce917557d21a96a22..76cf999ff3b7adf5c575513e7394bd9841bb6bfc 100644 (file)
@@ -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<dim,spacedim>& 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>&,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.