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

fix compilation with icc. Anyway, the use of an enum instead of a

Browse Source 
'const bool' is more consistent with the code around.
This commit is contained in:
Thomas Capricelli 2010-07-01 03:23:47 +02:00
parent 04648becf7
commit 2874101b62
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Eigen/src/Core/TriangularMatrix.h
View File

@ -545,10 +545,12 @@ template<typename MatrixType, unsigned int Mode>
template<typename OtherDerived> template<typename OtherDerived>
void TriangularView<MatrixType, Mode>::lazyAssign(const TriangularBase<OtherDerived>& other) void TriangularView<MatrixType, Mode>::lazyAssign(const TriangularBase<OtherDerived>& other)
{ {
const bool unroll = MatrixType::SizeAtCompileTime != Dynamic enum {
unroll = = MatrixType::SizeAtCompileTime != Dynamic
&& ei_traits<OtherDerived>::CoeffReadCost != Dynamic && ei_traits<OtherDerived>::CoeffReadCost != Dynamic
&& MatrixType::SizeAtCompileTime * ei_traits<OtherDerived>::CoeffReadCost / 2 && MatrixType::SizeAtCompileTime * ei_traits<OtherDerived>::CoeffReadCost / 2
<= EIGEN_UNROLLING_LIMIT; <= EIGEN_UNROLLING_LIMIT
};
ei_assert(m_matrix.rows() == other.rows() && m_matrix.cols() == other.cols()); ei_assert(m_matrix.rows() == other.rows() && m_matrix.cols() == other.cols());
ei_triangular_assignment_selector ei_triangular_assignment_selector
@ -584,10 +586,12 @@ template<typename Derived>
template<typename DenseDerived> template<typename DenseDerived>
void TriangularBase<Derived>::evalToLazy(MatrixBase<DenseDerived> &other) const void TriangularBase<Derived>::evalToLazy(MatrixBase<DenseDerived> &other) const
{ {
const bool unroll = DenseDerived::SizeAtCompileTime != Dynamic enum {
unroll = DenseDerived::SizeAtCompileTime != Dynamic
&& ei_traits<Derived>::CoeffReadCost != Dynamic && ei_traits<Derived>::CoeffReadCost != Dynamic
&& DenseDerived::SizeAtCompileTime * ei_traits<Derived>::CoeffReadCost / 2 && DenseDerived::SizeAtCompileTime * ei_traits<Derived>::CoeffReadCost / 2
<= EIGEN_UNROLLING_LIMIT; <= EIGEN_UNROLLING_LIMIT
};
ei_assert(this->rows() == other.rows() && this->cols() == other.cols()); ei_assert(this->rows() == other.rows() && this->cols() == other.cols());
ei_triangular_assignment_selector ei_triangular_assignment_selector