Compile subdivided_hyper_rectangle_with_simplices even without DEAL_II_WITH_SIMPLEX_S...

diff --git a/include/deal.II/simplex/grid_generator.h b/include/deal.II/simplex/grid_generator.h
index 2e68f9e1bd485428658d8d04e0254c25ce85bd03..3eaba788c94f0f277fffd98733413eba8b6a4758 100644 (file)
--- a/include/deal.II/simplex/grid_generator.h
+++ b/include/deal.II/simplex/grid_generator.h
@@ -27,8 +27,6 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT
-
 namespace GridGenerator
 {
   /**
@@ -77,8 +75,6 @@ namespace GridGenerator
 
 } // namespace GridGenerator
 
-#endif
-
 DEAL_II_NAMESPACE_CLOSE
 
 #endif

diff --git a/source/simplex/grid_generator.cc b/source/simplex/grid_generator.cc
index e17e69e39d0d9c14ec3e10b81f300f64e6021207..aaed0379d3d769e9983c72aa507765ad56f05e0f 100644 (file)
--- a/source/simplex/grid_generator.cc
+++ b/source/simplex/grid_generator.cc
@@ -19,8 +19,6 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT
-
 namespace GridGenerator
 {
   template <int dim, int spacedim>
@@ -32,6 +30,9 @@ namespace GridGenerator
     const Point<dim> &               p2,
     const bool                       colorize)
   {
+#ifndef DEAL_II_WITH_SIMPLEX_SUPPORT
+    Assert(false, ExcNeedsSimplexSupport());
+#endif
     AssertDimension(dim, spacedim);
 
     AssertThrow(colorize == false, ExcNotImplemented());
@@ -207,8 +208,6 @@ namespace GridGenerator
   }
 } // namespace GridGenerator
 
-#endif
-
 // explicit instantiations
 #include "grid_generator.inst"
 

diff --git a/source/simplex/grid_generator.inst.in b/source/simplex/grid_generator.inst.in
index 3c855b64ae1f0617b430882ce73f95519ff54850..b65ed758bbbf2930258b53a90170cc8e58890bad 100644 (file)
--- a/source/simplex/grid_generator.inst.in
+++ b/source/simplex/grid_generator.inst.in
@@ -15,8 +15,6 @@
 
 
 
-#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT
-
 for (deal_II_dimension : DIMENSIONS)
   {
     template void GridGenerator::subdivided_hyper_rectangle_with_simplices(
@@ -33,5 +31,3 @@ for (deal_II_dimension : DIMENSIONS)
       const double       p2,
       const bool         colorize);
   }
-
-#endif