diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-08-19 14:18:05 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-08-19 14:18:05 +0200 |
commit | 42e2578ef9fcbb62ad6e07933ccf531f6f7cd1b3 (patch) | |
tree | 90cef174284cad35f0d13d4b991db83335554caf /Eigen/src/Eigenvalues | |
parent | 5734ee6df42991e59609ffd26aaeb3c7aacd61e2 (diff) |
the min/max macros to detect unprotected min/max were undefined by some std header,
so let's declare them after and do the respective fixes ;)
Diffstat (limited to 'Eigen/src/Eigenvalues')
-rw-r--r-- | Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h index 742048153..84be9bce1 100644 --- a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h +++ b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h @@ -566,7 +566,7 @@ template<typename SolverType> struct direct_selfadjoint_eigenvalues<SolverType,3 // map the matrix coefficients to [-1:1] to avoid over- and underflow. Scalar scale = mat.cwiseAbs().maxCoeff(); - scale = std::max(scale,Scalar(1)); + scale = (std::max)(scale,Scalar(1)); MatrixType scaledMat = mat / scale; // Compute the eigenvalues @@ -646,7 +646,7 @@ template<typename SolverType> struct direct_selfadjoint_eigenvalues<SolverType,2 // map the matrix coefficients to [-1:1] to avoid over- and underflow. Scalar scale = mat.cwiseAbs().maxCoeff(); - scale = std::max(scale,Scalar(1)); + scale = (std::max)(scale,Scalar(1)); MatrixType scaledMat = mat / scale; // Compute the eigenvalues |