From b6dc3835995254235cdb12c383caabeb377ad7c6 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sat, 16 Jun 2018 23:02:29 +0200 Subject: [PATCH] Move preprocessor check and add comments --- include/deal.II/fe/fe_system.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 68e37c7514..854f0c4c37 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -439,6 +439,7 @@ public: FESystem(const std::vector *> &fes, const std::vector &multiplicities); +# if !defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1900 /** * Constructor taking an arbitrary number of parameters of type * std::pair>, unsigned @@ -477,9 +478,10 @@ public: * would have expected). * * @warning This feature is not available for Intel compilers - * prior to version 19.0 + * prior to version 19.0. Defining this + * constructor leads to internal compiler errors for Intel compilers prior + * to 18.0. */ -# if !defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1900 template < class... FEPairs, typename = typename enable_if_all< @@ -499,7 +501,8 @@ public: * @endcode * * @warning This feature is not available for Intel compilers - * prior to version 19.0 + * prior to version 19.0. The constructor is just not selected for overload + * resolution. */ FESystem( const std::initializer_list< -- 2.39.5