GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 12:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in changeset 5335659c47d69d3ee1b6f9792fea5998731f9a53

Browse Source
This commit is contained in:
Gael Guennebaud 2018-10-10 23:47:30 +02:00
parent ce243ee45b
commit f0aa7e40fc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Eigen/src/Core/PartialReduxEvaluator.h
View File

@ -134,6 +134,8 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> >
{ {
typedef PartialReduxExpr<ArgType, MemberOp, Direction> XprType; typedef PartialReduxExpr<ArgType, MemberOp, Direction> XprType;
typedef typename internal::nested_eval<ArgType,1>::type ArgTypeNested; 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 ArgType::Scalar InputScalar;
typedef typename XprType::Scalar Scalar; typedef typename XprType::Scalar Scalar;
enum { enum {
@ -193,7 +195,7 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> >
PacketType packet(Index idx) const PacketType packet(Index idx) const
{ {
enum { PacketSize = internal::unpacket_traits<PacketType>::size }; 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(ArgType::RowsAtCompileTime) : int(PacketSize),
Direction==Vertical ? int(PacketSize) : int(ArgType::ColsAtCompileTime), Direction==Vertical ? int(PacketSize) : int(ArgType::ColsAtCompileTime),
true /* InnerPanel */> PanelType; true /* InnerPanel */> PanelType;
@ -212,7 +214,7 @@ struct evaluator<PartialReduxExpr<ArgType, MemberOp, Direction> >
} }
protected: protected:
typename internal::add_const_on_value_type<ArgTypeNested>::type m_arg; ConstArgTypeNested m_arg;
const MemberOp m_functor; const MemberOp m_functor;
}; };