diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-01-24 12:50:29 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-01-24 12:50:29 +0100 |
| commit | deab937d4526c4542d13aa2654e8d898aab9a28b (patch) | |
| tree | cba601bfc4d737a7e0bd28bd127870a70e743dcb /Eigen/src/Core/Diagonal.h | |
| parent | 66f1c56aabc4ec4789405d11f544806312d49cd6 (diff) | |
NVCC: fix closed-form eigenvalue decomposition, workaround gcc4.7/nvcc5.5 issue
Diffstat (limited to 'Eigen/src/Core/Diagonal.h')
| -rw-r--r-- | Eigen/src/Core/Diagonal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Eigen/src/Core/Diagonal.h b/Eigen/src/Core/Diagonal.h index 4436c6a69..b160479ab 100644 --- a/Eigen/src/Core/Diagonal.h +++ b/Eigen/src/Core/Diagonal.h @@ -77,7 +77,12 @@ template<typename MatrixType, int _DiagIndex> class Diagonal EIGEN_DEVICE_FUNC inline Index rows() const - { 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()); } + { + EIGEN_USING_STD_MATH(min); + return m_index.value()<0 ? (min)(Index(m_matrix.cols()),Index(m_matrix.rows()+m_index.value())) + : (min)(Index(m_matrix.rows()),Index(m_matrix.cols()-m_index.value())); + + } EIGEN_DEVICE_FUNC inline Index cols() const { return 1; } |