diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-04-05 16:35:49 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-04-05 16:35:49 +0200 |
| commit | 12439e12490b9fd79fe18aa30ce09648dcb644ba (patch) | |
| tree | 4ba34589aa6fa04dd141e0374039165e62a9a3ac /Eigen/src/SVD/JacobiSVD.h | |
| parent | d93c1c113b9540e7a66d4b2c2dc3c1e99b5d26a1 (diff) | |
Port SelfCwiseBinaryOp and Dot.h to nvcc, fix portability issue with std::min/max
Diffstat (limited to 'Eigen/src/SVD/JacobiSVD.h')
| -rw-r--r-- | Eigen/src/SVD/JacobiSVD.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/SVD/JacobiSVD.h b/Eigen/src/SVD/JacobiSVD.h index 5741a8ba1..1616fe560 100644 --- a/Eigen/src/SVD/JacobiSVD.h +++ b/Eigen/src/SVD/JacobiSVD.h @@ -766,7 +766,7 @@ JacobiSVD<MatrixType, QRPreconditioner>::compute(const MatrixType& matrix, unsig // if this 2x2 sub-matrix is not diagonal already... // notice that this comparison will evaluate to false if any NaN is involved, ensuring that NaN's don't // keep us iterating forever. Similarly, small denormal numbers are considered zero. - using std::max; + EIGEN_USING_STD_MATH(max); RealScalar threshold = (max)(considerAsZero, precision * (max)(abs(m_workMatrix.coeff(p,p)), abs(m_workMatrix.coeff(q,q)))); if((max)(abs(m_workMatrix.coeff(p,q)),abs(m_workMatrix.coeff(q,p))) > threshold) |