From 63baf329e7f343ab03f20e71e1cb1ce724a1aa8e Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 5 Oct 2016 16:30:30 -0400 Subject: [PATCH] disable FE_enriched without cxx14 --- include/deal.II/fe/fe_enriched.h | 8 ++++++-- source/fe/fe_enriched.cc | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/deal.II/fe/fe_enriched.h b/include/deal.II/fe/fe_enriched.h index b3131e46da..6ed3a44c6d 100644 --- a/include/deal.II/fe/fe_enriched.h +++ b/include/deal.II/fe/fe_enriched.h @@ -18,7 +18,11 @@ #include -#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 #include #include @@ -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 537436d17b..4ba7ebfe88 100644 --- a/source/fe/fe_enriched.cc +++ b/source/fe/fe_enriched.cc @@ -13,7 +13,8 @@ // // --------------------------------------------------------------------- #include -#ifdef DEAL_II_WITH_CXX11 + +#ifdef DEAL_II_WITH_CXX14 #include @@ -921,4 +922,4 @@ InternalData::get_fe_output_object (const unsigned int base_no) const DEAL_II_NAMESPACE_CLOSE -#endif // CXX11 +#endif // CXX14 -- 2.39.5