From 617e89e9e893f9aac53be7153af24ae8052b1a28 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 11 Feb 2014 18:21:26 +0000 Subject: Fix compile error in MemBlockStream. Fix test/common memory leak checks now that MemBlockStream allocates another block. --- lib/common/MemBlockStream.cpp | 2 +- lib/common/MemBlockStream.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/common/MemBlockStream.cpp b/lib/common/MemBlockStream.cpp index f6b7d07b..90c0eaf6 100644 --- a/lib/common/MemBlockStream.cpp +++ b/lib/common/MemBlockStream.cpp @@ -63,7 +63,7 @@ MemBlockStream::MemBlockStream(const std::string& rMessage) { 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); diff --git a/lib/common/MemBlockStream.h b/lib/common/MemBlockStream.h index f02e57ba..98398121 100644 --- a/lib/common/MemBlockStream.h +++ b/lib/common/MemBlockStream.h @@ -10,10 +10,10 @@ #ifndef MEMBLOCKSTREAM__H #define MEMBLOCKSTREAM__H +#include "CollectInBufferStream.h" #include "IOStream.h" class StreamableMemBlock; -class CollectInBufferStream; // -------------------------------------------------------------------------- // -- cgit v1.2.3