mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-04-30 07:44:10 +08:00
fix internal error with gcc 3.3 (all tests are now ok with 3.3 !)
This commit is contained in:
parent
1e286464ab
commit
db079f3a8c
@ -61,7 +61,11 @@ struct ei_traits<PartialReduxExpr<MatrixType, MemberOp, Direction> >
|
|||||||
Flags = (unsigned int)_MatrixTypeNested::Flags & HereditaryBits,
|
Flags = (unsigned int)_MatrixTypeNested::Flags & HereditaryBits,
|
||||||
TraversalSize = Direction==Vertical ? RowsAtCompileTime : ColsAtCompileTime
|
TraversalSize = Direction==Vertical ? RowsAtCompileTime : ColsAtCompileTime
|
||||||
};
|
};
|
||||||
|
#if EIGEN_GNUC_AT_LEAST(3,4)
|
||||||
typedef typename MemberOp::template Cost<InputScalar,int(TraversalSize)> CostOpType;
|
typedef typename MemberOp::template Cost<InputScalar,int(TraversalSize)> CostOpType;
|
||||||
|
#else
|
||||||
|
typedef typename MemberOp::template Cost<InputScalar,TraversalSize> CostOpType;
|
||||||
|
#endif
|
||||||
enum {
|
enum {
|
||||||
CoeffReadCost = TraversalSize * ei_traits<_MatrixTypeNested>::CoeffReadCost + int(CostOpType::value)
|
CoeffReadCost = TraversalSize * ei_traits<_MatrixTypeNested>::CoeffReadCost + int(CostOpType::value)
|
||||||
};
|
};
|
||||||
@ -104,7 +108,7 @@ class PartialReduxExpr : ei_no_assignment_operator,
|
|||||||
{ enum { value = COST }; }; \
|
{ enum { value = COST }; }; \
|
||||||
template<typename Derived> \
|
template<typename Derived> \
|
||||||
inline ResultType operator()(const MatrixBase<Derived>& mat) const \
|
inline ResultType operator()(const MatrixBase<Derived>& mat) const \
|
||||||
{ return mat.MEMBER(); } \
|
{ return mat.MEMBER(); } \
|
||||||
}
|
}
|
||||||
|
|
||||||
EIGEN_MEMBER_FUNCTOR(squaredNorm, Size * NumTraits<Scalar>::MulCost + (Size-1)*NumTraits<Scalar>::AddCost);
|
EIGEN_MEMBER_FUNCTOR(squaredNorm, Size * NumTraits<Scalar>::MulCost + (Size-1)*NumTraits<Scalar>::AddCost);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user