aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/sparse_vector.cpp
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2011-08-19 14:18:05 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2011-08-19 14:18:05 +0200
commit42e2578ef9fcbb62ad6e07933ccf531f6f7cd1b3 (patch)
tree90cef174284cad35f0d13d4b991db83335554caf /test/sparse_vector.cpp
parent5734ee6df42991e59609ffd26aaeb3c7aacd61e2 (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 'test/sparse_vector.cpp')
-rw-r--r--test/sparse_vector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/sparse_vector.cpp b/test/sparse_vector.cpp
index b3249915e..5be4f5d9a 100644
--- a/test/sparse_vector.cpp
+++ b/test/sparse_vector.cpp
@@ -26,8 +26,8 @@
template<typename Scalar> void sparse_vector(int rows, int cols)
{
- double densityMat = std::max(8./(rows*cols), 0.01);
- double densityVec = std::max(8./float(rows), 0.1);
+ double densityMat = (std::max)(8./(rows*cols), 0.01);
+ double densityVec = (std::max)(8./float(rows), 0.1);
typedef Matrix<Scalar,Dynamic,Dynamic> DenseMatrix;
typedef Matrix<Scalar,Dynamic,1> DenseVector;
typedef SparseVector<Scalar> SparseVectorType;