GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-23 10:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation of swap for ICC

Browse Source
This commit is contained in:
Gael Guennebaud 2009-09-07 11:37:41 +02:00
parent a921292381
commit bdcc0bc157
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Eigen/src/Core/Matrix.h
View File

@ -713,13 +713,11 @@ class Matrix
m_storage.data()[1] = y; m_storage.data()[1] = y;
} }
template<typename MatrixType, typename OtherDerived, bool IsSameType, bool IsDynamicSize> template<typename MatrixType, typename OtherDerived, bool SwapPointers>
friend struct ei_matrix_swap_impl; friend struct ei_matrix_swap_impl;
}; };
template<typename MatrixType, typename OtherDerived, template<typename MatrixType, typename OtherDerived, bool SwapPointers>
bool IsSameType = ei_is_same_type<MatrixType, OtherDerived>::ret,
bool IsDynamicSize = MatrixType::SizeAtCompileTime==Dynamic>
struct ei_matrix_swap_impl struct ei_matrix_swap_impl
{ {
static inline void run(MatrixType& matrix, MatrixBase<OtherDerived>& other) static inline void run(MatrixType& matrix, MatrixBase<OtherDerived>& other)
@ -729,7 +727,7 @@ struct ei_matrix_swap_impl
}; };
template<typename MatrixType, typename OtherDerived> template<typename MatrixType, typename OtherDerived>
struct ei_matrix_swap_impl<MatrixType, OtherDerived, true, true> struct ei_matrix_swap_impl<MatrixType, OtherDerived, true>
{ {
static inline void run(MatrixType& matrix, MatrixBase<OtherDerived>& other) static inline void run(MatrixType& matrix, MatrixBase<OtherDerived>& other)
{ {
@ -741,7 +739,8 @@ template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int
template<typename OtherDerived> template<typename OtherDerived>
inline void Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>::swap(const MatrixBase<OtherDerived>& other) inline void Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>::swap(const MatrixBase<OtherDerived>& other)
{ {
ei_matrix_swap_impl<Matrix, OtherDerived>::run(*this, *const_cast<MatrixBase<OtherDerived>*>(&other)); enum { SwapPointers = ei_is_same_type<Matrix, OtherDerived>::ret && Base::SizeAtCompileTime==Dynamic };
ei_matrix_swap_impl<Matrix, OtherDerived, bool(SwapPointers)>::run(*this, *const_cast<MatrixBase<OtherDerived>*>(&other));
} }
/** \defgroup matrixtypedefs Global matrix typedefs /** \defgroup matrixtypedefs Global matrix typedefs