From c56dffae4c3d832ac42469810bfa6f49c779a30b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 22 Jul 2023 20:39:50 -0600 Subject: [PATCH] Prefer std::conditional_t over std::conditional::type. --- .../deal.II/matrix_free/evaluation_kernels.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h index 28a36ef5a1..664f5d15e1 100644 --- a/include/deal.II/matrix_free/evaluation_kernels.h +++ b/include/deal.II/matrix_free/evaluation_kernels.h @@ -1062,12 +1062,9 @@ namespace internal normal_dir, Number, Number2>; - using Eval0 = - typename std::conditional::type; - using Eval1 = - typename std::conditional::type; - using Eval2 = - typename std::conditional::type; + using Eval0 = std::conditional_t; + using Eval1 = std::conditional_t; + using Eval2 = std::conditional_t; const auto &shape_info = fe_eval.get_shape_info(); Eval0 eval0 = create_evaluator_tensor_product( @@ -1258,12 +1255,9 @@ namespace internal normal_dir, Number, Number2>; - using Eval0 = - typename std::conditional::type; - using Eval1 = - typename std::conditional::type; - using Eval2 = - typename std::conditional::type; + using Eval0 = std::conditional_t; + using Eval1 = std::conditional_t; + using Eval2 = std::conditional_t; const auto &shape_info = fe_eval.get_shape_info(); Eval0 eval0 = create_evaluator_tensor_product( -- 2.39.5