From: Peter Munch <peterrmuench@gmail.com>
Date: Thu, 22 Oct 2020 09:14:29 +0000 (+0200)
Subject: FEEvaluation: Simplify check for block vector
X-Git-Tag: v9.3.0-rc1~985^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11079%2Fhead;p=dealii.git

FEEvaluation: Simplify check for block vector
---

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index 0e86aa2209..97abf46ad5 100644
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -7516,7 +7516,7 @@ FEEvaluation<
 namespace internal
 {
   /**
-   * Implementation for vectors that have the begin() methods.
+   * Implementation for standard vectors (that have the begin() methods).
    */
   template <typename Number,
             typename VectorizedArrayType,
@@ -7573,7 +7573,7 @@ namespace internal
   }
 
   /**
-   * Implementation for all other vectors like block vectors.
+   * Implementation for block vectors.
    */
   template <typename Number,
             typename VectorizedArrayType,
@@ -7711,17 +7711,8 @@ namespace internal
 
   template <typename Number,
             typename VectorType,
-            typename std::enable_if<
-              internal::has_begin<VectorType>::value &&
-                (std::is_same<decltype(std::declval<VectorType>().begin()),
-                              const double *>::value ||
-                 std::is_same<decltype(std::declval<VectorType>().begin()),
-                              double *>::value ||
-                 std::is_same<decltype(std::declval<VectorType>().begin()),
-                              const float *>::value ||
-                 std::is_same<decltype(std::declval<VectorType>().begin()),
-                              float *>::value),
-              VectorType>::type * = nullptr>
+            typename std::enable_if<!IsBlockVector<VectorType>::value,
+                                    VectorType>::type * = nullptr>
   decltype(std::declval<VectorType>().begin())
   get_beginning(VectorType &vec)
   {
@@ -7730,17 +7721,8 @@ namespace internal
 
   template <typename Number,
             typename VectorType,
-            typename std::enable_if<
-              !internal::has_begin<VectorType>::value ||
-                !(std::is_same<decltype(std::declval<VectorType>().begin()),
-                               const double *>::value ||
-                  std::is_same<decltype(std::declval<VectorType>().begin()),
-                               double *>::value ||
-                  std::is_same<decltype(std::declval<VectorType>().begin()),
-                               const float *>::value ||
-                  std::is_same<decltype(std::declval<VectorType>().begin()),
-                               float *>::value),
-              VectorType>::type * = nullptr>
+            typename std::enable_if<IsBlockVector<VectorType>::value,
+                                    VectorType>::type * = nullptr>
   typename VectorType::value_type *
   get_beginning(VectorType &)
   {