From 8a30494662968727ff8ec762799339225394dcb1 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Fri, 27 May 2022 10:49:42 -0600 Subject: [PATCH] Intel 18: static constexpr bool --- include/deal.II/lac/la_parallel_vector.h | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index c10c405114..e06b7c3c51 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -1934,8 +1934,15 @@ namespace internal // Used for (Trilinos/PETSc)Wrappers::SparseMatrix template < typename MatrixType, +#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1900 typename std::enable_if && has_locally_owned_domain_indices, +#else + // workaround for Intel 18 + typename std::enable_if< + is_supported_operation && + is_supported_operation, +#endif MatrixType>::type * = nullptr> static void reinit_domain_vector(MatrixType & mat, @@ -1948,7 +1955,13 @@ namespace internal // Used for MatrixFree and DiagonalMatrix template = 1900 typename std::enable_if, +#else + // workaround for Intel 18 + typename std::enable_if< + is_supported_operation, +#endif MatrixType>::type * = nullptr> static void reinit_domain_vector(MatrixType & mat, @@ -1963,8 +1976,15 @@ namespace internal // Used for (Trilinos/PETSc)Wrappers::SparseMatrix template < typename MatrixType, +#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1900 typename std::enable_if && has_locally_owned_range_indices, +#else + // workaround for Intel 18 + typename std::enable_if< + is_supported_operation && + is_supported_operation, +#endif MatrixType>::type * = nullptr> static void reinit_range_vector(MatrixType & mat, @@ -1977,7 +1997,13 @@ namespace internal // Used for MatrixFree and DiagonalMatrix template = 1900 typename std::enable_if, +#else + // workaround for Intel 18 + typename std::enable_if< + is_supported_operation, +#endif MatrixType>::type * = nullptr> static void reinit_range_vector(MatrixType & mat, -- 2.39.5