From 1428f95919e2bcb61f0a0b20be6943e8a4e6b902 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 26 May 2020 23:14:18 -0400 Subject: [PATCH] Simplify C++14 lambda initializers --- .../deal.II/lac/constrained_linear_operator.h | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/include/deal.II/lac/constrained_linear_operator.h b/include/deal.II/lac/constrained_linear_operator.h index 7adb3c4ccd..b258b48d19 100644 --- a/include/deal.II/lac/constrained_linear_operator.h +++ b/include/deal.II/lac/constrained_linear_operator.h @@ -128,16 +128,14 @@ distribute_constraints_linear_operator( v.compress(VectorOperation::add); }; - // lambda capture expressions are a C++14 feature... - const auto vmult_add = return_op.vmult_add; - return_op.vmult = [vmult_add](Range &v, const Domain &u) { + return_op.vmult = [vmult_add = return_op.vmult_add](Range & v, + const Domain &u) { v = 0.; vmult_add(v, u); }; - // lambda capture expressions are a C++14 feature... - const auto Tvmult_add = return_op.Tvmult_add; - return_op.Tvmult = [Tvmult_add](Domain &v, const Range &u) { + return_op.Tvmult = [Tvmult_add = return_op.Tvmult_add](Domain & v, + const Range &u) { v = 0.; Tvmult_add(v, u); }; @@ -193,16 +191,14 @@ project_to_constrained_linear_operator( v.compress(VectorOperation::add); }; - // lambda capture expressions are a C++14 feature... - const auto vmult_add = return_op.vmult_add; - return_op.vmult = [vmult_add](Range &v, const Domain &u) { + return_op.vmult = [vmult_add = return_op.vmult_add](Range & v, + const Domain &u) { v = 0.; vmult_add(v, u); }; - // lambda capture expressions are a C++14 feature... - const auto Tvmult_add = return_op.Tvmult_add; - return_op.Tvmult = [Tvmult_add](Domain &v, const Range &u) { + return_op.Tvmult = [Tvmult_add = return_op.Tvmult_add](Domain & v, + const Range &u) { v = 0.; Tvmult_add(v, u); }; @@ -318,9 +314,7 @@ constrained_right_hand_side( v += Ct * (right_hand_side - linop * *k); }; - // lambda capture expressions are a C++14 feature... - const auto apply_add = return_comp.apply_add; - return_comp.apply = [apply_add](Range &v) { + return_comp.apply = [apply_add = return_comp.apply_add](Range &v) { v = 0.; apply_add(v); }; -- 2.39.5