Adapt MemoryOutStream for VC6 __int64 type

martinmoene · martinmoene · commit 65d2e03ec92b · 2013-05-10T11:32:15.000+02:00
diff --git a/UnitTest++/MemoryOutStream.cpp b/UnitTest++/MemoryOutStream.cpp
@@ -16,6 +16,33 @@ void MemoryOutStream::Clear()
 	m_text = this->str();
 }
 
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+
+#define snprintf _snprintf
+
+template<typename ValueType>
+std::ostream& FormatToStream(std::ostream& stream, char const* format, ValueType const& value)
+{
+   using namespace std;
+   
+   const size_t BUFFER_SIZE=32;
+   char txt[BUFFER_SIZE];
+   snprintf(txt, BUFFER_SIZE, format, value);
+   return stream << txt;
+}
+
+std::ostream& operator<<(std::ostream& stream, __int64 const n)
+{
+   return FormatToStream(stream, "%I64d", n);
+}
+
+std::ostream& operator<<(std::ostream& stream, unsigned __int64 const n)
+{
+   return FormatToStream(stream, "%I64u", n);
+}
+
+#endif
+
 }
 
 #else
@@ -108,7 +135,11 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned long const n)
     return *this;
 }
 
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+MemoryOutStream& MemoryOutStream::operator <<(__int64 const n)
+#else
 MemoryOutStream& MemoryOutStream::operator <<(long long const n)
+#endif
 {
 #ifdef UNITTEST_WIN32
 	FormatToStream(*this, "%I64d", n);
@@ -119,7 +150,11 @@ MemoryOutStream& MemoryOutStream::operator <<(long long const n)
 	return *this;
 }
 
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+MemoryOutStream& MemoryOutStream::operator <<(unsigned __int64 const n)
+#else
 MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)
+#endif
 {
 #ifdef UNITTEST_WIN32
 	FormatToStream(*this, "%I64u", n);
diff --git a/UnitTest++/MemoryOutStream.h b/UnitTest++/MemoryOutStream.h
@@ -26,12 +26,21 @@ class UNITTEST_LINKAGE MemoryOutStream : public std::ostringstream
     mutable std::string m_text;
 };
 
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+std::ostream& operator<<(std::ostream& stream, __int64 const n);
+std::ostream& operator<<(std::ostream& stream, unsigned __int64 const n);
+#endif
+
 }
 
 #else
 
 #include <cstddef>
 
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+namespace std {}
+#endif
+
 namespace UnitTest
 {
 
@@ -47,10 +56,15 @@ class UNITTEST_LINKAGE MemoryOutStream
     MemoryOutStream& operator <<(char const* txt);
     MemoryOutStream& operator <<(int n);
     MemoryOutStream& operator <<(long n);
-	MemoryOutStream& operator <<(long long n);
     MemoryOutStream& operator <<(unsigned long n);
-	MemoryOutStream& operator <<(unsigned long long n);
-    MemoryOutStream& operator <<(float f);
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+    MemoryOutStream& operator <<(__int64 n);
+    MemoryOutStream& operator <<(unsigned __int64 n);
+#else
+    MemoryOutStream& operator <<(long long n);
+    MemoryOutStream& operator <<(unsigned long long n);
+#endif
+   MemoryOutStream& operator <<(float f);
     MemoryOutStream& operator <<(double d);
     MemoryOutStream& operator <<(void const* p);
     MemoryOutStream& operator <<(unsigned int s);
diff --git a/tests/TestMemoryOutStream.cpp b/tests/TestMemoryOutStream.cpp
@@ -167,12 +167,15 @@ TEST(StreamingMinUnsignedLongWritesCorrectCharacters)
     CHECK_EQUAL("0", stream.GetText());
 }
 
-#ifndef UNITTEST_COMPILER_IS_MSVC6
 TEST(StreamingLongLongWritesCorrectCharacters)
 {
 	MemoryOutStream stream;
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+   stream << (__int64)-12345i64;
+#else
 	stream << (long long)-12345ll;
-	CHECK_EQUAL("-12345", stream.GetText());
+#endif
+   CHECK_EQUAL("-12345", stream.GetText());
 }
 
 #ifdef LLONG_MAX
@@ -196,8 +199,12 @@ TEST(StreamingMinLongLongWritesCorrectCharacters)
 TEST(StreamingUnsignedLongLongWritesCorrectCharacters)
 {
 	MemoryOutStream stream;
-	stream << (unsigned long long)85899ull;
-	CHECK_EQUAL("85899", stream.GetText());
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+   stream << (unsigned __int64)85899ui64;
+#else
+   stream << (unsigned long long)85899ull;
+#endif
+   CHECK_EQUAL("85899", stream.GetText());
 }
 
 #ifdef ULLONG_MAX
@@ -212,10 +219,13 @@ TEST(StreamingMaxUnsignedLongLongWritesCorrectCharacters)
 TEST(StreamingMinUnsignedLongLongWritesCorrectCharacters)
 {
     MemoryOutStream stream;
+#ifdef UNITTEST_COMPILER_IS_MSVC6
+    stream << (unsigned __int64)0ui64;
+#else
     stream << (unsigned long long)0ull;
+#endif
     CHECK_EQUAL("0", stream.GetText());
 }
-#endif
 
 TEST(StreamingFloatWritesCorrectCharacters)
 {

Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,15 @@ TEST(StreamingMinUnsignedLongWritesCorrectCharacters)`
`167`	`167`	`CHECK_EQUAL("0", stream.GetText());`
`168`	`168`	`}`
`169`	`169`
`170`		`-#ifndef UNITTEST_COMPILER_IS_MSVC6`
`171`	`170`	`TEST(StreamingLongLongWritesCorrectCharacters)`
`172`	`171`	`{`
`173`	`172`	`MemoryOutStream stream;`
	`173`	`+#ifdef UNITTEST_COMPILER_IS_MSVC6`
	`174`	`+ stream << (__int64)-12345i64;`
	`175`	`+#else`
`174`	`176`	`stream << (long long)-12345ll;`
`175`		`- CHECK_EQUAL("-12345", stream.GetText());`
	`177`	`+#endif`
	`178`	`+ CHECK_EQUAL("-12345", stream.GetText());`
`176`	`179`	`}`
`177`	`180`
`178`	`181`	`#ifdef LLONG_MAX`
`@@ -196,8 +199,12 @@ TEST(StreamingMinLongLongWritesCorrectCharacters)`
`196`	`199`	`TEST(StreamingUnsignedLongLongWritesCorrectCharacters)`
`197`	`200`	`{`
`198`	`201`	`MemoryOutStream stream;`
`199`		`- stream << (unsigned long long)85899ull;`
`200`		`- CHECK_EQUAL("85899", stream.GetText());`
	`202`	`+#ifdef UNITTEST_COMPILER_IS_MSVC6`
	`203`	`+ stream << (unsigned __int64)85899ui64;`
	`204`	`+#else`
	`205`	`+ stream << (unsigned long long)85899ull;`
	`206`	`+#endif`
	`207`	`+ CHECK_EQUAL("85899", stream.GetText());`
`201`	`208`	`}`
`202`	`209`
`203`	`210`	`#ifdef ULLONG_MAX`
`@@ -212,10 +219,13 @@ TEST(StreamingMaxUnsignedLongLongWritesCorrectCharacters)`
`212`	`219`	`TEST(StreamingMinUnsignedLongLongWritesCorrectCharacters)`
`213`	`220`	`{`
`214`	`221`	`MemoryOutStream stream;`
	`222`	`+#ifdef UNITTEST_COMPILER_IS_MSVC6`
	`223`	`+ stream << (unsigned __int64)0ui64;`
	`224`	`+#else`
`215`	`225`	`stream << (unsigned long long)0ull;`
	`226`	`+#endif`
`216`	`227`	`CHECK_EQUAL("0", stream.GetText());`
`217`	`228`	`}`
`218`		`-#endif`
`219`	`229`
`220`	`230`	`TEST(StreamingFloatWritesCorrectCharacters)`
`221`	`231`	`{`