diff options
| author |  Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-09-25 09:58:29 +0200 |
|---|---|---|
| committer | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-09-25 09:58:29 +0200 |
| commit | 088379ac2fcad3d73ef50f2763b34d5fa1197a5f (patch) | |
| tree | 804b51ba4e1af4f7b5291cdf2038258181694460 /Eigen | |
| parent | a01371548dc66ee8cbfac8effd5f560bf5d5697a (diff) | |
Fix MSVC compile error in SparseLU
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU.h | 2 | ||||
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU_Memory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/SparseLU/SparseLU.h b/Eigen/src/SparseLU/SparseLU.h index f5d15ec6b..6d0698a3d 100644 --- a/Eigen/src/SparseLU/SparseLU.h +++ b/Eigen/src/SparseLU/SparseLU.h @@ -470,7 +470,7 @@ void SparseLU<MatrixType, OrderingType>::factorize(const MatrixType& matrix) // Adjust panel size so that a panel won't overlap with the next relaxed snode. int panel_size = m_perfv.panel_size; // upper bound on panel width - for (k = jcol + 1; k < std::min(jcol+panel_size, n); k++) + for (k = jcol + 1; k < (std::min)(jcol+panel_size, n); k++) { if (relax_end(k) != IND_EMPTY) { diff --git a/Eigen/src/SparseLU/SparseLU_Memory.h b/Eigen/src/SparseLU/SparseLU_Memory.h index 0396ab61f..62adcb4a2 100644 --- a/Eigen/src/SparseLU/SparseLU_Memory.h +++ b/Eigen/src/SparseLU/SparseLU_Memory.h @@ -32,7 +32,7 @@ #define EIGEN_SPARSELU_MEMORY #define LU_NO_MARKER 3 -#define LU_NUM_TEMPV(m,w,t,b) (std::max(m, (t+b)*w) ) +#define LU_NUM_TEMPV(m,w,t,b) ((std::max)(m, (t+b)*w) ) #define IND_EMPTY (-1) #define LU_Reduce(alpha) ((alpha + 1) / 2) // i.e (alpha-1)/2 + 1 |