disable FE_enriched without cxx14

diff --git a/include/deal.II/fe/fe_enriched.h b/include/deal.II/fe/fe_enriched.h
index b3131e46dad81a0c19654cf4d041a3d3e6f8cbe1..6ed3a44c6d9af78b503d2c5a7b79da5e7f2fdddd 100644 (file)
--- a/include/deal.II/fe/fe_enriched.h
+++ b/include/deal.II/fe/fe_enriched.h
@@ -18,7 +18,11 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_WITH_CXX11
+// We require c++14 here even though we only need features that are part of
+// c++11, but it turns out that gcc 4.6.x and 4.7.x don't support c++11
+// features like delegating constructors.
+
+#ifdef DEAL_II_WITH_CXX14
 #include <deal.II/fe/fe.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/fe_nothing.h>
@@ -607,7 +611,7 @@ private:
 //}
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // CXX11
+#endif // CXX14
 
 #endif // dealii__fe_enriched_h
 

diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc
index 537436d17b6d9d2a55efc5246fcda17b30163ada..4ba7ebfe8869ffd41287c354c7f9f5f56292dc4e 100644 (file)
--- a/source/fe/fe_enriched.cc
+++ b/source/fe/fe_enriched.cc
@@ -13,7 +13,8 @@
 //
 // ---------------------------------------------------------------------
 #include <deal.II/fe/fe_enriched.h>
-#ifdef DEAL_II_WITH_CXX11
+
+#ifdef DEAL_II_WITH_CXX14
 
 #include <deal.II/fe/fe_tools.h>
 
@@ -921,4 +922,4 @@ InternalData::get_fe_output_object (const unsigned int base_no) const
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // CXX11
+#endif // CXX14