r23 | charles.nicholson | 2010-03-18 19:14:06 -0500 (Thu, 18 Mar 2010) | 1 line

pjohnmeyer · pjohnmeyer · commit 7510e7f42be4 · 2013-01-09T23:44:56.000-06:00
long long streaming for MemoryOutStream, from sony
diff --git a/src/MemoryOutStream.cpp b/src/MemoryOutStream.cpp
@@ -57,7 +57,7 @@ char const* MemoryOutStream::GetText() const
     return m_buffer;
 }
 
-MemoryOutStream& MemoryOutStream::operator << (char const* txt)
+MemoryOutStream& MemoryOutStream::operator <<(char const* txt)
 {
 	using namespace std;
 
@@ -74,37 +74,59 @@ MemoryOutStream& MemoryOutStream::operator << (char const* txt)
     return *this;
 }
 
-MemoryOutStream& MemoryOutStream::operator << (int const n)
+MemoryOutStream& MemoryOutStream::operator <<(int const n)
 {
     FormatToStream(*this, "%i", n);
     return *this;
 }
 
-MemoryOutStream& MemoryOutStream::operator << (long const n)
+MemoryOutStream& MemoryOutStream::operator <<(long const n)
 {
     FormatToStream(*this, "%li", n);
     return *this;
 }
 
-MemoryOutStream& MemoryOutStream::operator << (unsigned long const n)
+MemoryOutStream& MemoryOutStream::operator <<(unsigned long const n)
 {
     FormatToStream(*this, "%lu", n);
     return *this;
 }
 
-MemoryOutStream& MemoryOutStream::operator << (float const f)
+MemoryOutStream& MemoryOutStream::operator <<(long long const n)
+{
+#ifdef UNITTEST_WIN32
+	FormatToStream(*this, "%I64d", n);
+#else
+	FormatToStream(*this, "%lld", n);
+#endif
+
+	return *this;
+}
+
+MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)
+{
+#ifdef UNITTEST_WIN32
+	FormatToStream(*this, "%I64u", n);
+#else
+	FormatToStream(*this, "%llu", n);
+#endif
+
+	return *this;
+}
+
+MemoryOutStream& MemoryOutStream::operator <<(float const f)
 {
     FormatToStream(*this, "%ff", f);
     return *this;    
 }
 
-MemoryOutStream& MemoryOutStream::operator << (void const* p)
+MemoryOutStream& MemoryOutStream::operator <<(void const* p)
 {
     FormatToStream(*this, "%p", p);
     return *this;    
 }
 
-MemoryOutStream& MemoryOutStream::operator << (unsigned int const s)
+MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)
 {
     FormatToStream(*this, "%u", s);
     return *this;    
diff --git a/src/MemoryOutStream.h b/src/MemoryOutStream.h
@@ -42,14 +42,16 @@ class UNITTEST_LINKAGE MemoryOutStream
 
     char const* GetText() const;
 
-    MemoryOutStream& operator << (char const* txt);
-    MemoryOutStream& operator << (int n);
-    MemoryOutStream& operator << (long n);
-    MemoryOutStream& operator << (unsigned long n);
-    MemoryOutStream& operator << (float f);
-    MemoryOutStream& operator << (double d);
-    MemoryOutStream& operator << (void const* p);
-    MemoryOutStream& operator << (unsigned int s);
+    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);
+    MemoryOutStream& operator <<(double d);
+    MemoryOutStream& operator <<(void const* p);
+    MemoryOutStream& operator <<(unsigned int s);
 
     enum { GROW_CHUNK_SIZE = 32 };
     int GetCapacity() const;
diff --git a/src/tests/TestMemoryOutStream.cpp b/src/tests/TestMemoryOutStream.cpp
@@ -2,6 +2,8 @@
 
 #include "../MemoryOutStream.h"
 #include <cstring>
+#include <climits>
+#include <cstdlib>
 
 using namespace UnitTest;
 using namespace std;
@@ -57,6 +59,20 @@ TEST(StreamingUnsignedLongWritesCorrectCharacters)
     CHECK_EQUAL("123", stream.GetText());
 }
 
+TEST(StreamingLongLongWritesCorrectCharacters)
+{
+	MemoryOutStream stream;
+	stream << (long long)(ULONG_MAX) * 2;
+	CHECK_EQUAL("8589934590", stream.GetText());
+}
+
+TEST(StreamingUnsignedLongLongWritesCorrectCharacters)
+{
+	MemoryOutStream stream;
+	stream << (unsigned long long)(ULONG_MAX) * 2;
+	CHECK_EQUAL("8589934590", stream.GetText());
+}
+
 TEST(StreamingFloatWritesCorrectCharacters)
 {
     MemoryOutStream stream;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ char const* MemoryOutStream::GetText() const`
`57`	`57`	`return m_buffer;`
`58`	`58`	`}`
`59`	`59`
`60`		`-MemoryOutStream& MemoryOutStream::operator << (char const* txt)`
	`60`	`+MemoryOutStream& MemoryOutStream::operator <<(char const* txt)`
`61`	`61`	`{`
`62`	`62`	`using namespace std;`
`63`	`63`
`@@ -74,37 +74,59 @@ MemoryOutStream& MemoryOutStream::operator << (char const* txt)`
`74`	`74`	`return *this;`
`75`	`75`	`}`
`76`	`76`
`77`		`-MemoryOutStream& MemoryOutStream::operator << (int const n)`
	`77`	`+MemoryOutStream& MemoryOutStream::operator <<(int const n)`
`78`	`78`	`{`
`79`	`79`	`FormatToStream(*this, "%i", n);`
`80`	`80`	`return *this;`
`81`	`81`	`}`
`82`	`82`
`83`		`-MemoryOutStream& MemoryOutStream::operator << (long const n)`
	`83`	`+MemoryOutStream& MemoryOutStream::operator <<(long const n)`
`84`	`84`	`{`
`85`	`85`	`FormatToStream(*this, "%li", n);`
`86`	`86`	`return *this;`
`87`	`87`	`}`
`88`	`88`
`89`		`-MemoryOutStream& MemoryOutStream::operator << (unsigned long const n)`
	`89`	`+MemoryOutStream& MemoryOutStream::operator <<(unsigned long const n)`
`90`	`90`	`{`
`91`	`91`	`FormatToStream(*this, "%lu", n);`
`92`	`92`	`return *this;`
`93`	`93`	`}`
`94`	`94`
`95`		`-MemoryOutStream& MemoryOutStream::operator << (float const f)`
	`95`	`+MemoryOutStream& MemoryOutStream::operator <<(long long const n)`
	`96`	`+{`
	`97`	`+#ifdef UNITTEST_WIN32`
	`98`	`+ FormatToStream(*this, "%I64d", n);`
	`99`	`+#else`
	`100`	`+ FormatToStream(*this, "%lld", n);`
	`101`	`+#endif`
	`102`	`+`
	`103`	`+ return *this;`
	`104`	`+}`
	`105`	`+`
	`106`	`+MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)`
	`107`	`+{`
	`108`	`+#ifdef UNITTEST_WIN32`
	`109`	`+ FormatToStream(*this, "%I64u", n);`
	`110`	`+#else`
	`111`	`+ FormatToStream(*this, "%llu", n);`
	`112`	`+#endif`
	`113`	`+`
	`114`	`+ return *this;`
	`115`	`+}`
	`116`	`+`
	`117`	`+MemoryOutStream& MemoryOutStream::operator <<(float const f)`
`96`	`118`	`{`
`97`	`119`	`FormatToStream(*this, "%ff", f);`
`98`	`120`	`return *this;`
`99`	`121`	`}`
`100`	`122`
`101`		`-MemoryOutStream& MemoryOutStream::operator << (void const* p)`
	`123`	`+MemoryOutStream& MemoryOutStream::operator <<(void const* p)`
`102`	`124`	`{`
`103`	`125`	`FormatToStream(*this, "%p", p);`
`104`	`126`	`return *this;`
`105`	`127`	`}`
`106`	`128`
`107`		`-MemoryOutStream& MemoryOutStream::operator << (unsigned int const s)`
	`129`	`+MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)`
`108`	`130`	`{`
`109`	`131`	`FormatToStream(*this, "%u", s);`
`110`	`132`	`return *this;`