diff options
author | Gael Guennebaud <g.gael@free.fr> | 2018-10-10 20:59:00 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2018-10-10 20:59:00 +0000 |
commit | 5335659c47d69d3ee1b6f9792fea5998731f9a53 (patch) | |
tree | 7ac2ed495b6825f65a8707abb7098090a7a9f493 /Eigen | |
parent | eec0dfd688215701f0fba429b068ee3f5c569573 (diff) | |
parent | 8e6dc2c81d478ae1c1699ec69eb02cc42a84ffbf (diff) |
Merged in ezhulenev/eigen-02 (pull request PR-525)
Fix bug in partial reduction of expressions requiring evaluation
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/PartialReduxEvaluator.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h index 0bf8a50e0..d9c0f1224 100644 --- a/Eigen/src/Core/PartialReduxEvaluator.h +++ b/Eigen/src/Core/PartialReduxEvaluator.h @@ -134,7 +134,6 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> > { typedef PartialReduxExpr<ArgType, MemberOp, Direction> XprType; typedef typename internal::nested_eval<ArgType,1>::type ArgTypeNested; - typedef typename internal::remove_all<ArgTypeNested>::type ArgTypeNestedCleaned; typedef typename ArgType::Scalar InputScalar; typedef typename XprType::Scalar Scalar; enum { @@ -194,7 +193,7 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> > PacketType packet(Index idx) const { enum { PacketSize = internal::unpacket_traits<PacketType>::size }; - typedef Block<const ArgType, + typedef Block<typename internal::add_const_on_value_type<ArgTypeNested>::type, Direction==Vertical ? int(ArgType::RowsAtCompileTime) : int(PacketSize), Direction==Vertical ? int(PacketSize) : int(ArgType::ColsAtCompileTime), true /* InnerPanel */> PanelType; |