From 954de8f89a5538129b5ebf89b8fe06678051f516 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sun, 29 Aug 2010 16:28:10 +0000
Subject: tests: Various compilation fixes for BCC and MSVC6

git-svn-id: http://pugixml.googlecode.com/svn/trunk@702 99668b35-9821-0410-8761-19e4c4f06640
---
 tests/main.cpp           | 1 +
 tests/test_memory.cpp    | 8 ++++----
 tests/test_xpath_api.cpp | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/main.cpp b/tests/main.cpp
index 22404f2..a8c5ae2 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -3,6 +3,7 @@
 
 #include <exception>
 #include <stdio.h>
+#include <float.h>
 #include <assert.h>
 
 test_runner* test_runner::_tests = 0;
diff --git a/tests/test_memory.cpp b/tests/test_memory.cpp
index b7a5577..a37b91e 100644
--- a/tests/test_memory.cpp
+++ b/tests/test_memory.cpp
@@ -164,7 +164,7 @@ TEST(memory_string_allocate_decreasing)
 
 	for (int i = 0; i < 17; ++i) s += s;
 
-	for (int i = 0; i < 17; ++i)
+	for (int j = 0; j < 17; ++j)
 	{
 		s.resize(s.size() / 2);
 
@@ -178,9 +178,9 @@ TEST(memory_string_allocate_decreasing)
 	CHECK(result.size() == 262143);
 	CHECK(result[result.size() - 1] == 'x');
 
-	for (size_t j = 0; j + 1 < result.size(); ++j)
+	for (size_t k = 0; k + 1 < result.size(); ++k)
 	{
-		CHECK(result[j] == (j % 2 ? 'b' : 'a'));
+		CHECK(result[k] == (k % 2 ? 'b' : 'a'));
 	}
 }
 
@@ -221,7 +221,7 @@ TEST(memory_string_allocate_decreasing_inplace)
 
 	for (int i = 0; i < 17; ++i) s += s;
 
-	for (int i = 0; i < 17; ++i)
+	for (int j = 0; j < 17; ++j)
 	{
 		s.resize(s.size() / 2);
 
diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp
index 90f316e..df9b9a6 100644
--- a/tests/test_xpath_api.cpp
+++ b/tests/test_xpath_api.cpp
@@ -1,10 +1,11 @@
 #ifndef PUGIXML_NO_XPATH
 
+#include <string.h> // because Borland's STL is braindead, we have to include <string.h> _before_ <string> in order to get memcmp
+
 #include "common.hpp"
 
 #include "helpers.hpp"
 
-#include <string.h>
 #include <string>
 
 TEST_XML(xpath_api_select_nodes, "<node><head/><foo/><foo/><tail/></node>")
-- 
cgit v1.2.3