diff options
author | Gael Guennebaud <g.gael@free.fr> | 2014-07-02 09:35:37 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2014-07-02 09:35:37 +0200 |
commit | 61b88d2feb8f23d1ba122f2c9a73abb183ebb25d (patch) | |
tree | da8fbb7e88c6668bbf4b63e2c988697d95f9f2de /Eigen/src/LU/PartialPivLU.h | |
parent | 8f4cdbbc8f9b2214b906412701722a150cba3460 (diff) | |
parent | bf334b8ae51725754f525c2ffcfbd83ffc55ff2e (diff) |
merge with default branch
Diffstat (limited to 'Eigen/src/LU/PartialPivLU.h')
-rw-r--r-- | Eigen/src/LU/PartialPivLU.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Eigen/src/LU/PartialPivLU.h b/Eigen/src/LU/PartialPivLU.h index 65312f7d1..02db81e9a 100644 --- a/Eigen/src/LU/PartialPivLU.h +++ b/Eigen/src/LU/PartialPivLU.h @@ -536,7 +536,6 @@ MatrixBase<Derived>::partialPivLu() const } #endif -#if EIGEN2_SUPPORT_STAGE > STAGE20_RESOLVE_API_CONFLICTS /** \lu_module * * Synonym of partialPivLu(). @@ -554,8 +553,6 @@ MatrixBase<Derived>::lu() const } #endif -#endif - } // end namespace Eigen #endif // EIGEN_PARTIALLU_H |