diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
| commit | fe57b2f963da832d14f4d7b6d4a9554ceef26e36 (patch) | |
| tree | ed0e5d13ae6dde3f98d012ad3f87570b77e8230d /Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h | |
| parent | c12b7896d0ddf95e8f060c93a5cf2fcfa1e6865c (diff) | |
bug #701: workaround (min) and (max) blocking ADL by introducing numext::mini and numext::maxi internal functions and a EIGEN_NOT_A_MACRO macro.
Diffstat (limited to 'Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h')
| -rw-r--r-- | Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h index 1dd2ab45b..54f60b197 100644 --- a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h +++ b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h @@ -732,7 +732,6 @@ struct direct_selfadjoint_eigenvalues<SolverType,2,false> EIGEN_DEVICE_FUNC static inline void run(SolverType& solver, const MatrixType& mat, int options) { - EIGEN_USING_STD_MATH(max) EIGEN_USING_STD_MATH(sqrt); eigen_assert(mat.cols() == 2 && mat.cols() == mat.rows()); @@ -746,7 +745,7 @@ struct direct_selfadjoint_eigenvalues<SolverType,2,false> // map the matrix coefficients to [-1:1] to avoid over- and underflow. Scalar scale = mat.cwiseAbs().maxCoeff(); - scale = (max)(scale,Scalar(1)); + scale = numext::maxi(scale,Scalar(1)); MatrixType scaledMat = mat / scale; // Compute the eigenvalues |