From 5c82fd7f40e926e07a2303bc144334286fe48d70 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sun, 23 Jan 2011 18:49:36 -0500 Subject: [PATCH] Move part() to EIGEN2_SUPPORT (had been deprecated for a long time) --- Eigen/src/Core/MatrixBase.h | 2 ++ 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 class MatrixBase typename MatrixBase::template DiagonalIndexReturnType::Type diagonal(Index index); typename MatrixBase::template ConstDiagonalIndexReturnType::Type diagonal(Index index) const; + #ifdef EIGEN2_SUPPORT template TriangularView part(); template const TriangularView part() const; + #endif template struct TriangularViewReturnType { typedef TriangularView Type; }; template struct ConstTriangularViewReturnType { typedef const TriangularView 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::evalToLazy(MatrixBase &other) const * Implementation of MatrixBase methods ***************************************************************************/ +#ifdef EIGEN2_SUPPORT /** \deprecated use MatrixBase::triangularView() */ template template -EIGEN_DEPRECATED const TriangularView MatrixBase::part() const +const TriangularView MatrixBase::part() const { return derived(); } @@ -687,10 +688,11 @@ EIGEN_DEPRECATED const TriangularView MatrixBase::part() /** \deprecated use MatrixBase::triangularView() */ template template -EIGEN_DEPRECATED TriangularView MatrixBase::part() +TriangularView MatrixBase::part() { return derived(); } +#endif /** * \returns an expression of a triangular view extracted from the current matrix