From: Denis Davydov Date: Tue, 26 Feb 2019 05:34:05 +0000 (+0100) Subject: fix internal::has_begin type trait used in FEEvaluation X-Git-Tag: v9.1.0-rc1~319^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46446db7262b34e2c26e59fc5b66345903cc62bd;p=dealii.git fix internal::has_begin type trait used in FEEvaluation --- diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 20b8249e03..77e6975cff 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -3466,8 +3466,7 @@ namespace internal public: static constexpr bool value = - std::is_same()))>::value; + !std::is_same()))>::value; }; diff --git a/tests/matrix_free/fe_evaluation_type_traits.cc b/tests/matrix_free/fe_evaluation_type_traits.cc index 762da8b50d..ffa6552698 100644 --- a/tests/matrix_free/fe_evaluation_type_traits.cc +++ b/tests/matrix_free/fe_evaluation_type_traits.cc @@ -142,7 +142,8 @@ main() << std::endl << "TrilinosWrappers::MPI::Vector = " << internal::has_begin::value << std::endl - << "Vector = " << internal::has_begin>::value << std::endl; + << "Vector = " << internal::has_begin>::value << std::endl + << "Dummy = " << internal::has_begin>::value << std::endl; // check is_vectorizable: deallog << "is_vectorizable:" << std::endl diff --git a/tests/matrix_free/fe_evaluation_type_traits.with_trilinos=true.output b/tests/matrix_free/fe_evaluation_type_traits.with_trilinos=true.output index 801cf4191e..b7e821fc99 100644 --- a/tests/matrix_free/fe_evaluation_type_traits.with_trilinos=true.output +++ b/tests/matrix_free/fe_evaluation_type_traits.with_trilinos=true.output @@ -16,6 +16,7 @@ DEAL::has_begin: DEAL::LinearAlgebra::distributed::Vector = 1 DEAL::TrilinosWrappers::MPI::Vector = 1 DEAL::Vector = 1 +DEAL::Dummy = 0 DEAL::is_vectorizable: DEAL::LinearAlgebra::distributed::Vector && double = 1 DEAL::LinearAlgebra::distributed::Vector && float = 0