diff options
| author |  Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-09-28 10:44:25 +0200 |
|---|---|---|
| committer | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-09-28 10:44:25 +0200 |
| commit | b68102d9a29ac2f631dead3d861f9e84c5897e9c (patch) | |
| tree | 88b2b2a81728cddd860d52d88c2656eeae0ca37c /Eigen/src/SparseLU/SparseLU_column_bmod.h | |
| parent | 87074d97e5a0f709f45dcb17493d2151295b6ce2 (diff) | |
MSVC needs parentheses around min and max
Diffstat (limited to 'Eigen/src/SparseLU/SparseLU_column_bmod.h')
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU_column_bmod.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/SparseLU/SparseLU_column_bmod.h b/Eigen/src/SparseLU/SparseLU_column_bmod.h index b268c4348..94f18fb73 100644 --- a/Eigen/src/SparseLU/SparseLU_column_bmod.h +++ b/Eigen/src/SparseLU/SparseLU_column_bmod.h @@ -76,7 +76,7 @@ int SparseLUBase<Scalar,Index>::LU_column_bmod(const int jcol, const int nseg, B { // outside the rectangular supernode fsupc = glu.xsup(ksupno); - fst_col = std::max(fsupc, fpanelc); + fst_col = (std::max)(fsupc, fpanelc); // Distance from the current supernode to the current panel; // d_fsupc = 0 if fsupc > fpanelc @@ -86,7 +86,7 @@ int SparseLUBase<Scalar,Index>::LU_column_bmod(const int jcol, const int nseg, B lptr = glu.xlsub(fsupc) + d_fsupc; kfnz = repfnz(krep); - kfnz = std::max(kfnz, fpanelc); + kfnz = (std::max)(kfnz, fpanelc); segsize = krep - kfnz + 1; nsupc = krep - fst_col + 1; @@ -132,7 +132,7 @@ int SparseLUBase<Scalar,Index>::LU_column_bmod(const int jcol, const int nseg, B * 1) fsupc < fpanelc, then fst_col <-- fpanelc * 2) fsupc >= fpanelc, then fst_col <-- fsupc */ - fst_col = std::max(fsupc, fpanelc); + fst_col = (std::max)(fsupc, fpanelc); if (fst_col < jcol) { |