From: Denis Davydov <davydden@gmail.com>
Date: Tue, 18 Apr 2017 09:03:12 +0000 (+0200)
Subject: remove CXX14 requirement from FE_Enriched as we switched to C++11 of gcc4.8 and alike
X-Git-Tag: v9.0.0-rc1~1673^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb476bb5cc9eba332cb8b052fd4915796e88fcb;p=dealii.git

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 097da0edb7..45113558ea 100644
--- 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 2b84fd8641..cf492902ea 100644
--- 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