fixed windows build and removed msvc warnings

2008-02-25 10:28:53 +00:00
parent a20a8d2522
commit a25c25b02a
12 changed files with 28 additions and 22 deletions
--- a/test/test_primitives.cpp
+++ b/test/test_primitives.cpp
@@ -316,7 +316,7 @@ int test_main()
 			int dist = distance_exp(a, b);

 			TEST_CHECK(dist >= 0 && dist < 160);
-			TEST_CHECK(dist == ((i == j)?0:std::max(i, j)));
+			TEST_CHECK(dist == ((i == j)?0:(std::max)(i, j)));

 			for (int k = 0; k < 160; k += 4)
 			{