From e3dd074042012fea8315943028002df657c42a46 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Sat, 9 Apr 2022 21:16:57 +0200 Subject: [PATCH] Simplify check for BlockVector --- include/deal.II/matrix_free/fe_evaluation.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 159f5e5d29..b4c4ab72ff 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -7247,11 +7247,9 @@ namespace internal typename VectorizedArrayType, typename VectorType, typename EvaluatorType, - typename std::enable_if< - internal::has_begin && - std::is_same().begin()), - Number *>::value, - VectorType>::type * = nullptr> + typename std::enable_if && + !IsBlockVector::value, + VectorType>::type * = nullptr> VectorizedArrayType * check_vector_access_inplace(const EvaluatorType &fe_eval, VectorType &vector) { @@ -7297,11 +7295,9 @@ namespace internal typename VectorizedArrayType, typename VectorType, typename EvaluatorType, - typename std::enable_if< - !internal::has_begin || - !std::is_same().begin()), - Number *>::value, - VectorType>::type * = nullptr> + typename std::enable_if || + IsBlockVector::value, + VectorType>::type * = nullptr> VectorizedArrayType * check_vector_access_inplace(const EvaluatorType &, VectorType &) { -- 2.39.5