devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Core/Dot.h
View File

@@ -81,19 +81,19 @@ MatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const
eigen_assert(size() == other.size());
#if EIGEN2_SUPPORT_STAGE >= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API
return internal::dot_nocheck<Derived,OtherDerived>::run(*this, other);
#else
return internal::dot_nocheck<OtherDerived,Derived>::run(other,*this);
#endif
}
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API
/** \returns the dot product of *this with other, with the Eigen2 convention that the dot product is linear in the first variable
* (conjugating the second variable). Of course this only makes a difference in the complex case.
*
* This method is only available in EIGEN2_SUPPORT mode. With EIGEN2_SUPPORT_STAGE1_FULL_EIGEN2_API and
* EIGEN2_SUPPORT_STAGE2_RESOLVE_API_CONFLICTS, the dot() method itself uses it. With EIGEN2_SUPPORT_STAGE3_FULL_EIGEN3_API,
* This method is only available in EIGEN2_SUPPORT mode. With EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API and
* EIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS, the dot() method itself uses it. With EIGEN2_SUPPORT_STAGE30_FULL_EIGEN3_API,
* the dot() method no longer uses it, but it's still available.
*
* \only_for_vectors

2
Eigen/src/Core/Map.h
View File

@@ -124,7 +124,7 @@ template<typename PlainObjectType, int MapOptions, typename StrideType> class Ma
EIGEN_DENSE_PUBLIC_INTERFACE(Map)
typedef typename Base::PointerType PointerType;
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API
typedef const Scalar* PointerArgType;
inline PointerType cast_to_pointer_type(PointerArgType ptr) { return const_cast<PointerType>(ptr); }
#else

18
Eigen/src/Core/MatrixBase.h
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;