From f6adf2710063afc426765db978f213062a695f28 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Thu, 22 Oct 2020 11:14:29 +0200 Subject: [PATCH] FEEvaluation: Simplify check for block vector --- include/deal.II/matrix_free/fe_evaluation.h | 30 +++++---------------- 1 file changed, 6 insertions(+), 24 deletions(-) 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 ::value && - (std::is_same().begin()), - const double *>::value || - std::is_same().begin()), - double *>::value || - std::is_same().begin()), - const float *>::value || - std::is_same().begin()), - float *>::value), - VectorType>::type * = nullptr> + typename std::enable_if::value, + VectorType>::type * = nullptr> decltype(std::declval().begin()) get_beginning(VectorType &vec) { @@ -7730,17 +7721,8 @@ namespace internal template ::value || - !(std::is_same().begin()), - const double *>::value || - std::is_same().begin()), - double *>::value || - std::is_same().begin()), - const float *>::value || - std::is_same().begin()), - float *>::value), - VectorType>::type * = nullptr> + typename std::enable_if::value, + VectorType>::type * = nullptr> typename VectorType::value_type * get_beginning(VectorType &) { -- 2.39.5