diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-09-14 14:06:21 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-09-14 14:06:21 -0700 |
| commit | c0d56a543e170d221e58b177b245c0e57ce1993a (patch) | |
| tree | 5c589ae8fc87b24adf8516335933cfd9645d79b7 /Eigen/src/Core/MatrixBase.h | |
| parent | 488ad7dd1b2806ad57f435ebb2461b6ab57443b9 (diff) | |
Added several missing EIGEN_DEVICE_FUNC qualifiers
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 334a4d71e..976b130e3 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -98,7 +98,7 @@ template<typename Derived> class MatrixBase /** \returns the size of the main diagonal, which is min(rows(),cols()). * \sa rows(), cols(), SizeAtCompileTime. */ EIGEN_DEVICE_FUNC - inline Index diagonalSize() const { return (std::min)(rows(),cols()); } + inline Index diagonalSize() const { return (numext::mini)(rows(),cols()); } typedef typename Base::PlainObject PlainObject; |