diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
commit | 22bff949c898e7c340a415d771145c0bd22317d6 (patch) | |
tree | be0fc956a220db15d4d7622fc580777f563ea643 /unsupported/test/BVH.cpp | |
parent | d4bd8bddb5e9f968ffcbdfff5936934e3d706684 (diff) |
protect calls to min and max with parentheses to make Eigen compatible with default windows.h
(transplanted from 49b6e9143e1d74441924c0c313536e263e12a55c
)
Diffstat (limited to 'unsupported/test/BVH.cpp')
-rw-r--r-- | unsupported/test/BVH.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/test/BVH.cpp b/unsupported/test/BVH.cpp index ba5871e66..d773afb77 100644 --- a/unsupported/test/BVH.cpp +++ b/unsupported/test/BVH.cpp @@ -143,10 +143,10 @@ struct TreeTest VectorType pt = VectorType::Random(); BallPointStuff<Dim> i1(pt), i2(pt); - double m1 = std::numeric_limits<double>::max(), m2 = m1; + double m1 = (std::numeric_limits<double>::max)(), m2 = m1; for(int i = 0; i < (int)b.size(); ++i) - m1 = std::min(m1, i1.minimumOnObject(b[i])); + m1 = (std::min)(m1, i1.minimumOnObject(b[i])); m2 = BVMinimize(tree, i2); @@ -194,11 +194,11 @@ struct TreeTest BallPointStuff<Dim> i1, i2; - double m1 = std::numeric_limits<double>::max(), m2 = m1; + double m1 = (std::numeric_limits<double>::max)(), m2 = m1; for(int i = 0; i < (int)b.size(); ++i) for(int j = 0; j < (int)v.size(); ++j) - m1 = std::min(m1, i1.minimumOnObjectObject(b[i], v[j])); + m1 = (std::min)(m1, i1.minimumOnObjectObject(b[i], v[j])); m2 = BVMinimize(tree, vTree, i2); |