diff options
| -rw-r--r-- | Eigen/src/Core/DiagonalMatrix.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 5 | ||||
| -rw-r--r-- | Eigen/src/Core/NestByValue.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h index bd23b2e09..08c046611 100644 --- a/Eigen/src/Core/DiagonalMatrix.h +++ b/Eigen/src/Core/DiagonalMatrix.h @@ -68,10 +68,10 @@ class DiagonalBase : public AnyMatrixBase<Derived> const DiagonalProduct<MatrixDerived, Derived, OnTheLeft> operator*(const MatrixBase<MatrixDerived> &matrix) const; - inline const DiagonalWrapper<NestByValue<CwiseUnaryOp<ei_scalar_inverse_op<Scalar>, DiagonalVectorType> > > + inline const DiagonalWrapper<CwiseUnaryOp<ei_scalar_inverse_op<Scalar>, DiagonalVectorType> > inverse() const { - return diagonal().cwiseInverse().nestByValue(); + return diagonal().cwiseInverse(); } }; diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 62aed3b7f..e599a9e03 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -119,8 +119,8 @@ template<typename Derived> class MatrixBase /** \brief The plain matrix type corresponding to this expression. * - * This is not necessarily exactly the return type of eval(). In the case of plain matrices, - * the return type of eval() is a const reference to a matrix, not a matrix! It is however guaranteed + * This is not necessarily exactly the return type of eval(). In the case of plain matrices, + * the return type of eval() is a const reference to a matrix, not a matrix! It is however guaranteed * that the return type of eval() is either PlainMatrixType or const PlainMatrixType&. */ typedef Matrix<typename ei_traits<Derived>::Scalar, @@ -278,7 +278,6 @@ template<typename Derived> class MatrixBase NoAlias<Derived,Eigen::MatrixBase > noalias(); - inline const NestByValue<Derived> nestByValue() const; inline const ForceAlignedAccess<Derived> forceAlignedAccess() const; inline ForceAlignedAccess<Derived> forceAlignedAccess(); template<bool Enable> inline const typename ei_meta_if<Enable,ForceAlignedAccess<Derived>,Derived&>::ret forceAlignedAccessIf() const; diff --git a/Eigen/src/Core/NestByValue.h b/Eigen/src/Core/NestByValue.h index d70ab1ecb..9f6d1c0c0 100644 --- a/Eigen/src/Core/NestByValue.h +++ b/Eigen/src/Core/NestByValue.h @@ -109,7 +109,7 @@ template<typename ExpressionType> class NestByValue */ template<typename Derived> inline const NestByValue<Derived> -MatrixBase<Derived>::nestByValue() const +DenseBase<Derived>::nestByValue() const { return NestByValue<Derived>(derived()); } |