From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Sun, 23 Jul 2023 02:39:50 +0000 (-0600)
Subject: Prefer std::conditional_t over std::conditional::type.
X-Git-Tag: relicensing~647^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c56dffae4c3d832ac42469810bfa6f49c779a30b;p=dealii.git

Prefer std::conditional_t over std::conditional::type.
---

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<normal_dir == 0, EvalNormal, EvalTangent>::type;
-    using Eval1 =
-      typename std::conditional<normal_dir == 1, EvalNormal, EvalTangent>::type;
-    using Eval2 =
-      typename std::conditional<normal_dir == 2, EvalNormal, EvalTangent>::type;
+    using Eval0 = std::conditional_t<normal_dir == 0, EvalNormal, EvalTangent>;
+    using Eval1 = std::conditional_t<normal_dir == 1, EvalNormal, EvalTangent>;
+    using Eval2 = std::conditional_t<normal_dir == 2, EvalNormal, EvalTangent>;
 
     const auto &shape_info = fe_eval.get_shape_info();
     Eval0       eval0      = create_evaluator_tensor_product<Eval0>(
@@ -1258,12 +1255,9 @@ namespace internal
                                         normal_dir,
                                         Number,
                                         Number2>;
-    using Eval0 =
-      typename std::conditional<normal_dir == 0, EvalNormal, EvalTangent>::type;
-    using Eval1 =
-      typename std::conditional<normal_dir == 1, EvalNormal, EvalTangent>::type;
-    using Eval2 =
-      typename std::conditional<normal_dir == 2, EvalNormal, EvalTangent>::type;
+    using Eval0 = std::conditional_t<normal_dir == 0, EvalNormal, EvalTangent>;
+    using Eval1 = std::conditional_t<normal_dir == 1, EvalNormal, EvalTangent>;
+    using Eval2 = std::conditional_t<normal_dir == 2, EvalNormal, EvalTangent>;
 
     const auto &shape_info = fe_eval.get_shape_info();
     Eval0       eval0      = create_evaluator_tensor_product<Eval0>(