diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-10 10:11:29 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-10 10:11:29 +0200 |
| commit | b6d3fcf6f28c189bf270e8f9cffc13913a814925 (patch) | |
| tree | e71bbbc6b9151c0d3cd96b8d85be502b21f26721 /Eigen/src/Core/Diagonal.h | |
| parent | e3929485486ad4450dd93d24fa2af9dd72aa368e (diff) | |
Fix bug #605: ambiguous call to std::min when calling .diagonal() on a sparse matrix with non default index type
Diffstat (limited to 'Eigen/src/Core/Diagonal.h')
| -rw-r--r-- | Eigen/src/Core/Diagonal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/Diagonal.h b/Eigen/src/Core/Diagonal.h index 0927e9969..c106f93c4 100644 --- a/Eigen/src/Core/Diagonal.h +++ b/Eigen/src/Core/Diagonal.h @@ -75,7 +75,7 @@ template<typename MatrixType, int _DiagIndex> class Diagonal EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Diagonal) inline Index rows() const - { return m_index.value()<0 ? (std::min)(m_matrix.cols(),m_matrix.rows()+m_index.value()) : (std::min)(m_matrix.rows(),m_matrix.cols()-m_index.value()); } + { return m_index.value()<0 ? (std::min<Index>)(m_matrix.cols(),m_matrix.rows()+m_index.value()) : (std::min<Index>)(m_matrix.rows(),m_matrix.cols()-m_index.value()); } inline Index cols() const { return 1; } |