[Rcpp-commits] r3187 - pkg/RcppEigen/inst/include/unsupported/Eigen/src/SparseExtra

[noreply at r-forge.r-project.org]

Author: dmbates
Date: 2011-08-31 22:42:30 +0200 (Wed, 31 Aug 2011)
New Revision: 3187

Modified:
   pkg/RcppEigen/inst/include/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h
Log:
Update to Eigen 3.0.2


Modified: pkg/RcppEigen/inst/include/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h
===================================================================
--- pkg/RcppEigen/inst/include/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h	2011-08-28 21:09:09 UTC (rev 3186)
+++ pkg/RcppEigen/inst/include/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h	2011-08-31 20:42:30 UTC (rev 3187)
@@ -295,10 +295,10 @@
     umfpack_get_lunz(&lnz, &unz, &rows, &cols, &nz_udiag, m_numeric, Scalar());
 
     // allocate data
-    m_l.resize(rows,std::min(rows,cols));
+    m_l.resize(rows,(std::min)(rows,cols));
     m_l.resizeNonZeros(lnz);
     
-    m_u.resize(std::min(rows,cols),cols);
+    m_u.resize((std::min)(rows,cols),cols);
     m_u.resizeNonZeros(unz);
 
     m_p.resize(rows);