From: Peter Munch <peterrmuench@gmail.com>
Date: Sat, 9 Apr 2022 19:16:57 +0000 (+0200)
Subject: Simplify check for BlockVector
X-Git-Tag: v9.4.0-rc1~325^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13606%2Fhead;p=dealii.git

Simplify check for BlockVector
---

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<VectorType> &&
-                std::is_same<decltype(std::declval<VectorType>().begin()),
-                             Number *>::value,
-              VectorType>::type * = nullptr>
+            typename std::enable_if<internal::has_begin<VectorType> &&
+                                      !IsBlockVector<VectorType>::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<VectorType> ||
-                !std::is_same<decltype(std::declval<VectorType>().begin()),
-                              Number *>::value,
-              VectorType>::type * = nullptr>
+            typename std::enable_if<!internal::has_begin<VectorType> ||
+                                      IsBlockVector<VectorType>::value,
+                                    VectorType>::type * = nullptr>
   VectorizedArrayType *
   check_vector_access_inplace(const EvaluatorType &, VectorType &)
   {