diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-01-26 16:36:07 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-01-26 16:36:07 +0100 |
commit | 98285ba81c8e90c95434bfa262484f2aa5d2664b (patch) | |
tree | 27348c602174eea9b650df8e9d0abca3881ed974 /Eigen/src/LU/PartialPivLU.h | |
parent | 7ef9d82b39b338c814f4c120ef3dea58a244a391 (diff) | |
parent | 76c630d185b4a9eda5261a6f4651cafdebb91508 (diff) |
merge
Diffstat (limited to 'Eigen/src/LU/PartialPivLU.h')
-rw-r--r-- | Eigen/src/LU/PartialPivLU.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Eigen/src/LU/PartialPivLU.h b/Eigen/src/LU/PartialPivLU.h index f9e645ec1..2533a3874 100644 --- a/Eigen/src/LU/PartialPivLU.h +++ b/Eigen/src/LU/PartialPivLU.h @@ -489,6 +489,7 @@ MatrixBase<Derived>::partialPivLu() const return PartialPivLU<PlainObject>(eval()); } +#if EIGEN2_SUPPORT_STAGE > STAGE20_RESOLVE_API_CONFLICTS /** \lu_module * * Synonym of partialPivLu(). @@ -503,5 +504,6 @@ MatrixBase<Derived>::lu() const { return PartialPivLU<PlainObject>(eval()); } +#endif #endif // EIGEN_PARTIALLU_H |