diff options
author | 2018-10-10 23:47:30 +0200 | |
---|---|---|
committer | 2018-10-10 23:47:30 +0200 | |
commit | f0aa7e40fcb9745129d0ec61802f594fddf1a657 (patch) | |
tree | 6a6f174531486482c1f9c476c06c6943af9b635e /Eigen | |
parent | ce243ee45bb1d17483f40411007eb31427d34766 (diff) |
Fix regression in changeset 5335659c47d69d3ee1b6f9792fea5998731f9a53
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/PartialReduxEvaluator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h index d9c0f1224..e524f32a6 100644 --- a/Eigen/src/Core/PartialReduxEvaluator.h +++ b/Eigen/src/Core/PartialReduxEvaluator.h @@ -134,6 +134,8 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> > { typedef PartialReduxExpr<ArgType, MemberOp, Direction> XprType; typedef typename internal::nested_eval<ArgType,1>::type ArgTypeNested; + typedef typename internal::add_const_on_value_type<ArgTypeNested>::type ConstArgTypeNested; + typedef typename internal::remove_all<ArgTypeNested>::type ArgTypeNestedCleaned; typedef typename ArgType::Scalar InputScalar; typedef typename XprType::Scalar Scalar; enum { @@ -193,7 +195,7 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> > PacketType packet(Index idx) const { enum { PacketSize = internal::unpacket_traits<PacketType>::size }; - typedef Block<typename internal::add_const_on_value_type<ArgTypeNested>::type, + typedef Block<const ArgTypeNestedCleaned, Direction==Vertical ? int(ArgType::RowsAtCompileTime) : int(PacketSize), Direction==Vertical ? int(PacketSize) : int(ArgType::ColsAtCompileTime), true /* InnerPanel */> PanelType; @@ -212,7 +214,7 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> > } protected: - typename internal::add_const_on_value_type<ArgTypeNested>::type m_arg; + ConstArgTypeNested m_arg; const MemberOp m_functor; }; |