diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-01 09:56:40 +0100 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-01 09:56:40 +0100 |
| commit | 7b3e205ebd4c8af6cd1ab65b538915a01c54bd35 (patch) | |
| tree | 99e6f23dd7429bc2ec62192a188d5c75e4265298 /Eigen | |
| parent | 88be82679171c3ef13c432949f4b635482b422e3 (diff) | |
Removed NestByValue dependency from VectorwiseOp.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Array/VectorwiseOp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Array/VectorwiseOp.h b/Eigen/src/Array/VectorwiseOp.h index 7193e6f68..0a46f49fc 100644 --- a/Eigen/src/Array/VectorwiseOp.h +++ b/Eigen/src/Array/VectorwiseOp.h @@ -436,7 +436,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp template<typename OtherDerived> CwiseBinaryOp<ei_scalar_sum_op<Scalar>, ExpressionType, - NestByValue<typename ExtendedType<OtherDerived>::Type> > + typename ExtendedType<OtherDerived>::Type> operator+(const MatrixBase<OtherDerived>& other) const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived); @@ -447,7 +447,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp template<typename OtherDerived> CwiseBinaryOp<ei_scalar_difference_op<Scalar>, ExpressionType, - NestByValue<typename ExtendedType<OtherDerived>::Type> > + typename ExtendedType<OtherDerived>::Type> operator-(const MatrixBase<OtherDerived>& other) const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived); @@ -478,10 +478,10 @@ template<typename ExpressionType, int Direction> class VectorwiseOp Direction==Horizontal ? 1 : int(ei_traits<ExpressionType>::ColsAtCompileTime)> HNormalized_Factors; typedef CwiseBinaryOp<ei_scalar_quotient_op<typename ei_traits<ExpressionType>::Scalar>, - NestByValue<HNormalized_Block>, - NestByValue<Replicate<NestByValue<HNormalized_Factors>, + HNormalized_Block, + Replicate<HNormalized_Factors, Direction==Vertical ? HNormalized_SizeMinusOne : 1, - Direction==Horizontal ? HNormalized_SizeMinusOne : 1> > > + Direction==Horizontal ? HNormalized_SizeMinusOne : 1> > HNormalizedReturnType; const HNormalizedReturnType hnormalized() const; |