[Box Backup-commit] COMMIT r3258 - in box/trunk: lib/common test/common

[subversion at boxbackup.org]

Author: chris
Date: 2014-02-11 18:21:26 +0000 (Tue, 11 Feb 2014)
New Revision: 3258

Modified:
   box/trunk/lib/common/MemBlockStream.cpp
   box/trunk/lib/common/MemBlockStream.h
   box/trunk/test/common/testcommon.cpp
Log:
Fix compile error in MemBlockStream.

Fix test/common memory leak checks now that MemBlockStream allocates another
block.


Modified: box/trunk/lib/common/MemBlockStream.cpp
===================================================================
--- box/trunk/lib/common/MemBlockStream.cpp	2014-02-11 10:29:31 UTC (rev 3257)
+++ box/trunk/lib/common/MemBlockStream.cpp	2014-02-11 18:21:26 UTC (rev 3258)
@@ -63,7 +63,7 @@
 {
 	mTempBuffer.Write(rMessage.c_str(), rMessage.size());
 	mTempBuffer.SetForReading();
-	mpBuffer = mTempBuffer.GetBuffer();
+	mpBuffer = (const char *)(mTempBuffer.GetBuffer());
 	mBytesInBuffer = rMessage.size();
 	ASSERT(mpBuffer != 0);
 	ASSERT(mBytesInBuffer >= 0);

Modified: box/trunk/lib/common/MemBlockStream.h
===================================================================
--- box/trunk/lib/common/MemBlockStream.h	2014-02-11 10:29:31 UTC (rev 3257)
+++ box/trunk/lib/common/MemBlockStream.h	2014-02-11 18:21:26 UTC (rev 3258)
@@ -10,10 +10,10 @@
 #ifndef MEMBLOCKSTREAM__H
 #define MEMBLOCKSTREAM__H
 
+#include "CollectInBufferStream.h"
 #include "IOStream.h"
 
 class StreamableMemBlock;
-class CollectInBufferStream;
 
 // --------------------------------------------------------------------------
 //

Modified: box/trunk/test/common/testcommon.cpp
===================================================================
--- box/trunk/test/common/testcommon.cpp	2014-02-11 10:29:31 UTC (rev 3257)
+++ box/trunk/test/common/testcommon.cpp	2014-02-11 18:21:26 UTC (rev 3258)
@@ -273,21 +273,21 @@
 	{
 		Timers::Cleanup();
 
-		TEST_THAT(memleakfinder_numleaks() == 0);
+		TEST_EQUAL(0, memleakfinder_numleaks());
 		void *block = ::malloc(12);
-		TEST_THAT(memleakfinder_numleaks() == 1);
+		TEST_EQUAL(1, memleakfinder_numleaks());
 		void *b2 = ::realloc(block, 128*1024);
-		TEST_THAT(memleakfinder_numleaks() == 1);
+		TEST_EQUAL(1, memleakfinder_numleaks());
 		::free(b2);
-		TEST_THAT(memleakfinder_numleaks() == 0);
+		TEST_EQUAL(0, memleakfinder_numleaks());
 		char *test = new char[1024];
-		TEST_THAT(memleakfinder_numleaks() == 1);
+		TEST_EQUAL(1, memleakfinder_numleaks());
 		MemBlockStream *s = new MemBlockStream(test,12);
-		TEST_THAT(memleakfinder_numleaks() == 2);
+		TEST_EQUAL(3, memleakfinder_numleaks());
 		delete s;
-		TEST_THAT(memleakfinder_numleaks() == 1);
+		TEST_EQUAL(1, memleakfinder_numleaks());
 		delete [] test;
-		TEST_THAT(memleakfinder_numleaks() == 0);
+		TEST_EQUAL(0, memleakfinder_numleaks());
 
 		Timers::Init();
 	}