From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 7 May 2015 16:47:33 +0000 (-0500)
Subject: Remove a few #ifdefs by just moving a variable into the Assertion.
X-Git-Tag: v8.3.0-rc1~189^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d94efb33651ea3b68b6632604f64e70edca56586;p=dealii.git

Remove a few #ifdefs by just moving a variable into the Assertion.
---

diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index a2715b986f..b71d1ac809 100644
--- a/include/deal.II/numerics/vector_tools.templates.h
+++ b/include/deal.II/numerics/vector_tools.templates.h
@@ -6724,11 +6724,8 @@ namespace VectorTools
                const InVector        &fe_function,
                const Point<spacedim>      &point)
   {
-#ifdef DEBUG
-    const FiniteElement<dim> &fe = dof.get_fe();
-    Assert(fe.n_components() == 1,
+    Assert(dof.get_fe().n_components() == 1,
            ExcMessage ("Finite element is not scalar as is necessary for this function"));
-#endif
 
     Vector<double> value(1);
     point_value(mapping, dof, fe_function, point, value);
@@ -6744,11 +6741,8 @@ namespace VectorTools
                const InVector        &fe_function,
                const Point<spacedim>      &point)
   {
-#ifdef DEBUG
-    const hp::FECollection<dim, spacedim> &fe = dof.get_fe();
-    Assert(fe.n_components() == 1,
+    Assert(dof.get_fe().n_components() == 1,
            ExcMessage ("Finite element is not scalar as is necessary for this function"));
-#endif
 
     Vector<double> value(1);
     point_value(mapping, dof, fe_function, point, value);
@@ -6901,11 +6895,8 @@ namespace VectorTools
                   const InVector        &fe_function,
                   const Point<spacedim>      &point)
   {
-#ifdef DEBUG
-    const FiniteElement<dim> &fe = dof.get_fe();
-    Assert(fe.n_components() == 1,
+    Assert(dof.get_fe().n_components() == 1,
            ExcMessage ("Finite element is not scalar as is necessary for this function"));
-#endif
 
     std::vector<Tensor<1, dim> > gradient(1);
     point_gradient (mapping, dof, fe_function, point, gradient);
@@ -6921,11 +6912,8 @@ namespace VectorTools
                   const InVector        &fe_function,
                   const Point<spacedim>      &point)
   {
-#ifdef DEBUG
-    const hp::FECollection<dim, spacedim> &fe = dof.get_fe();
-    Assert(fe.n_components() == 1,
+    Assert(dof.get_fe().n_components() == 1,
            ExcMessage ("Finite element is not scalar as is necessary for this function"));
-#endif
 
     std::vector<Tensor<1, dim> > gradient(1);
     point_gradient (mapping, dof, fe_function, point, gradient);