rename build stages to multiples of 10; old stage 2 becomes stage 15, while stage 20 generates errors (instead of warnings) on conflicting API.

This commit is contained in:
Benoit Jacob
2011-01-23 18:22:18 -05:00
parent cc1f70abc3
commit 8df5bca979
6 changed files with 87 additions and 34 deletions

View File

@@ -200,15 +200,17 @@ template<typename Derived> class MatrixBase
const DiagonalProduct<Derived, DiagonalDerived, OnTheRight>
operator*(const DiagonalBase<DiagonalDerived> &diagonal) const;
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE == STAGE2_RESOLVE_API_CONFLICTS
EIGEN_DEPRECATED
#endif
Scalar dot(const MatrixBase<OtherDerived>& other) const;
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE != STAGE20_RESOLVE_API_CONFLICTS
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE >= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE == STAGE15_RESOLVE_API_CONFLICTS_WARN
EIGEN_DEPRECATED
#endif
Scalar dot(const MatrixBase<OtherDerived>& other) const;
#endif
#if EIGEN2_SUPPORT_STAGE != STAGE99_NO_EIGEN2_SUPPORT
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API
EIGEN_DEPRECATED
#endif
Scalar eigen2_dot(const MatrixBase<OtherDerived>& other) const;