Add changes required to compile with MS VC6

martinmoene · martinmoene · commit 23127fe5b954 · 2013-05-09T11:12:29.000+02:00
Add macro UNITTEST_COMPILER_IS_MSVC6
Add macro UNIITEST_NS_QUAL_STD(fun)
Avoid __pragma()
Skip tests with long long
diff --git a/UnitTest++/Config.h b/UnitTest++/Config.h
@@ -7,7 +7,8 @@
 	#pragma warning(disable:4702) // unreachable code
 	#pragma warning(disable:4722) // destructor never returns, potential memory leak
 
-	#if (_MSC_VER == 1200)  // VC6
+#if (_MSC_VER == 1200)  // VC6
+		#define UNITTEST_COMPILER_IS_MSVC6
 		#pragma warning(disable:4786)
 		#pragma warning(disable:4290)
 	#endif
@@ -60,4 +61,13 @@
 
 //#define UNITTEST_NO_EXCEPTIONS
 
+
+// std namespace qualification: used for functions like strcpy that 
+// may live in std:: namespace (cstring header).
+#if defined( UNITTEST_COMPILER_IS_MSVC6 )
+	#define UNIITEST_NS_QUAL_STD(x) x
+#else
+	#define UNIITEST_NS_QUAL_STD(x) ::std::x
+#endif
+
 #endif
diff --git a/UnitTest++/DeferredTestResult.cpp b/UnitTest++/DeferredTestResult.cpp
@@ -16,7 +16,7 @@ DeferredTestFailure::DeferredTestFailure()
 DeferredTestFailure::DeferredTestFailure(int lineNumber_, const char* failureStr_)
 	: lineNumber(lineNumber_)
 {
-	std::strcpy(failureStr, failureStr_);
+	UNIITEST_NS_QUAL_STD(strcpy)(failureStr, failureStr_);
 }
 
 DeferredTestResult::DeferredTestResult()
diff --git a/UnitTest++/HelperMacros.h b/UnitTest++/HelperMacros.h
@@ -5,7 +5,7 @@
 
 #define UNITTEST_MULTILINE_MACRO_BEGIN do {
 
-#ifdef UNITTEST_WIN32
+#if defined(UNITTEST_WIN32) && !defined(UNITTEST_COMPILER_IS_MSVC6)
 	#define UNITTEST_MULTILINE_MACRO_END \
 		} __pragma(warning(push)) __pragma(warning(disable:4127)) while (0) __pragma(warning(pop))
 #else
diff --git a/tests/TestChecks.cpp b/tests/TestChecks.cpp
@@ -150,7 +150,7 @@ TEST(CheckCloseWithNaNFails)
 {
 	const unsigned int bitpattern = 0xFFFFFFFF;
 	float nan;
-	std::memcpy(&nan, &bitpattern, sizeof(bitpattern));
+	UNIITEST_NS_QUAL_STD(memcpy)(&nan, &bitpattern, sizeof(bitpattern));
 
 	TestResults results;
     CheckClose(results, 3.0f, nan, 0.1f, TestDetails("", "", "", 0));
@@ -161,7 +161,7 @@ TEST(CheckCloseWithNaNAgainstItselfFails)
 {
 	const unsigned int bitpattern = 0xFFFFFFFF;
 	float nan;
-	std::memcpy(&nan, &bitpattern, sizeof(bitpattern));
+	UNIITEST_NS_QUAL_STD(memcpy)(&nan, &bitpattern, sizeof(bitpattern));
 
     TestResults results;
     CheckClose(results, nan, nan, 0.1f, TestDetails("", "", "", 0));
diff --git a/tests/TestMemoryOutStream.cpp b/tests/TestMemoryOutStream.cpp
@@ -167,6 +167,7 @@ TEST(StreamingMinUnsignedLongWritesCorrectCharacters)
     CHECK_EQUAL("0", stream.GetText());
 }
 
+#ifndef UNITTEST_COMPILER_IS_MSVC6
 TEST(StreamingLongLongWritesCorrectCharacters)
 {
 	MemoryOutStream stream;
@@ -214,6 +215,7 @@ TEST(StreamingMinUnsignedLongLongWritesCorrectCharacters)
     stream << (unsigned long long)0ull;
     CHECK_EQUAL("0", stream.GetText());
 }
+#endif
 
 TEST(StreamingFloatWritesCorrectCharacters)
 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ DeferredTestFailure::DeferredTestFailure()`
`16`	`16`	`DeferredTestFailure::DeferredTestFailure(int lineNumber_, const char* failureStr_)`
`17`	`17`	`: lineNumber(lineNumber_)`
`18`	`18`	`{`
`19`		`- std::strcpy(failureStr, failureStr_);`
	`19`	`+ UNIITEST_NS_QUAL_STD(strcpy)(failureStr, failureStr_);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`DeferredTestResult::DeferredTestResult()`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ TEST(StreamingMinUnsignedLongWritesCorrectCharacters)`
`167`	`167`	`CHECK_EQUAL("0", stream.GetText());`
`168`	`168`	`}`
`169`	`169`
	`170`	`+#ifndef UNITTEST_COMPILER_IS_MSVC6`
`170`	`171`	`TEST(StreamingLongLongWritesCorrectCharacters)`
`171`	`172`	`{`
`172`	`173`	`MemoryOutStream stream;`
`@@ -214,6 +215,7 @@ TEST(StreamingMinUnsignedLongLongWritesCorrectCharacters)`
`214`	`215`	`stream << (unsigned long long)0ull;`
`215`	`216`	`CHECK_EQUAL("0", stream.GetText());`
`216`	`217`	`}`
	`218`	`+#endif`
`217`	`219`
`218`	`220`	`TEST(StreamingFloatWritesCorrectCharacters)`
`219`	`221`	`{`