remove CXX14 requirement from FE_Enriched as we switched to C++11 of gcc4.8 and alike

diff --git a/include/deal.II/fe/fe_enriched.h b/include/deal.II/fe/fe_enriched.h
index 097da0edb76897a4d36b60ceebd4f9b0334ce8dd..45113558eaa7afded8d1d17b21c9fd6d30b87008 100644 (file)
--- a/include/deal.II/fe/fe_enriched.h
+++ b/include/deal.II/fe/fe_enriched.h
@@ -18,11 +18,6 @@
 
 #include <deal.II/base/config.h>
 
-// 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>
@@ -649,6 +644,4 @@ private:
 //}
 DEAL_II_NAMESPACE_CLOSE
 
-#endif // CXX14
-
 #endif // dealii__fe_enriched_h

diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc
index 2b84fd86419fc863888afba6db52ed66b864d172..cf492902ea32e10c73d9d09dfefba98f129e6cf4 100644 (file)
--- a/source/fe/fe_enriched.cc
+++ b/source/fe/fe_enriched.cc
@@ -16,8 +16,6 @@
 
 #include <deal.II/fe/fe_enriched.h>
 
-#ifdef DEAL_II_WITH_CXX14
-
 #include <deal.II/fe/fe_tools.h>
 
 DEAL_II_NAMESPACE_OPEN
@@ -942,5 +940,3 @@ InternalData::get_fe_output_object (const unsigned int base_no) const
 #include "fe_enriched.inst"
 
 DEAL_II_NAMESPACE_CLOSE
-
-#endif // CXX14