diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-23 18:49:36 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-23 18:49:36 -0500 |
| commit | 5c82fd7f40e926e07a2303bc144334286fe48d70 (patch) | |
| tree | a6614a32417b75eac675862c175b1b6f1a2771b5 /Eigen | |
| parent | 1cf4996d3cfab2c7b8f0d390aa65ab64e4ec7e90 (diff) | |
Move part() to EIGEN2_SUPPORT (had been deprecated for a long time)
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/TriangularMatrix.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 457450c43..783fdaa48 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -242,8 +242,10 @@ template<typename Derived> class MatrixBase typename MatrixBase::template DiagonalIndexReturnType<Dynamic>::Type diagonal(Index index); typename MatrixBase::template ConstDiagonalIndexReturnType<Dynamic>::Type diagonal(Index index) const; + #ifdef EIGEN2_SUPPORT template<unsigned int Mode> TriangularView<Derived, Mode> part(); template<unsigned int Mode> const TriangularView<Derived, Mode> part() const; + #endif template<unsigned int Mode> struct TriangularViewReturnType { typedef TriangularView<Derived, Mode> Type; }; template<unsigned int Mode> struct ConstTriangularViewReturnType { typedef const TriangularView<const Derived, Mode> Type; }; diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index bbf1dce1f..af5092a7e 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -676,10 +676,11 @@ void TriangularBase<Derived>::evalToLazy(MatrixBase<DenseDerived> &other) const * Implementation of MatrixBase methods ***************************************************************************/ +#ifdef EIGEN2_SUPPORT /** \deprecated use MatrixBase::triangularView() */ template<typename Derived> template<unsigned int Mode> -EIGEN_DEPRECATED const TriangularView<Derived, Mode> MatrixBase<Derived>::part() const +const TriangularView<Derived, Mode> MatrixBase<Derived>::part() const { return derived(); } @@ -687,10 +688,11 @@ EIGEN_DEPRECATED const TriangularView<Derived, Mode> MatrixBase<Derived>::part() /** \deprecated use MatrixBase::triangularView() */ template<typename Derived> template<unsigned int Mode> -EIGEN_DEPRECATED TriangularView<Derived, Mode> MatrixBase<Derived>::part() +TriangularView<Derived, Mode> MatrixBase<Derived>::part() { return derived(); } +#endif /** * \returns an expression of a triangular view extracted from the current matrix |