diff options
author | Max Horn | 2009-10-18 19:41:59 +0000 |
---|---|---|
committer | Max Horn | 2009-10-18 19:41:59 +0000 |
commit | 2bbf708deaf2d60c70786ec1ef2f9ea0d1f0bd4a (patch) | |
tree | 3aac193c0b0419c50f72690bdfa77016ea413464 /common/stream.cpp | |
parent | 64861f1e40ee5084bcbfa3e5bd3adbe746d7dfc5 (diff) | |
download | scummvm-rg350-2bbf708deaf2d60c70786ec1ef2f9ea0d1f0bd4a.tar.gz scummvm-rg350-2bbf708deaf2d60c70786ec1ef2f9ea0d1f0bd4a.tar.bz2 scummvm-rg350-2bbf708deaf2d60c70786ec1ef2f9ea0d1f0bd4a.zip |
Introduced new type Common::DisposeAfterUse::Flag
svn-id: r45233
Diffstat (limited to 'common/stream.cpp')
-rw-r--r-- | common/stream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/stream.cpp b/common/stream.cpp index 9329ddea6c..07ca37555d 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -37,7 +37,7 @@ MemoryReadStream *ReadStream::readStream(uint32 dataSize) { void *buf = malloc(dataSize); dataSize = read(buf, dataSize); assert(dataSize > 0); - return new MemoryReadStream((byte *)buf, dataSize, true); + return new MemoryReadStream((byte *)buf, dataSize, DisposeAfterUse::YES); } @@ -188,7 +188,7 @@ uint32 SubReadStream::read(void *dataPtr, uint32 dataSize) { return dataSize; } -SeekableSubReadStream::SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool disposeParentStream) +SeekableSubReadStream::SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream) : SubReadStream(parentStream, end, disposeParentStream), _parentStream(parentStream), _begin(begin) { @@ -222,7 +222,7 @@ bool SeekableSubReadStream::seek(int32 offset, int whence) { return ret; } -BufferedReadStream::BufferedReadStream(ReadStream *parentStream, uint32 bufSize, bool disposeParentStream) +BufferedReadStream::BufferedReadStream(ReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) : _parentStream(parentStream), _disposeParentStream(disposeParentStream), _pos(0), @@ -279,7 +279,7 @@ uint32 BufferedReadStream::read(void *dataPtr, uint32 dataSize) { return alreadyRead + dataSize; } -BufferedSeekableReadStream::BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, bool disposeParentStream) +BufferedSeekableReadStream::BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) : BufferedReadStream(parentStream, bufSize, disposeParentStream), _parentStream(parentStream) { } |