thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: remove virtual functions from BufferedStreams

Browse source 
As Max pointed out to me, they don't work as expected when called from constructors/destructors.

svn-id: r52724
This commit is contained in:
Yotam Barnoy 2010-09-14 14:57:30 +00:00
parent 9dfb24851c
commit 94b41f5d2e
2 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/stream.cpp
View file

@ -231,21 +231,13 @@ BufferedReadStream::BufferedReadStream(ReadStream *parentStream, uint32 bufSize,
_realBufSize(bufSize) {
assert(parentStream);
allocBuf(bufSize);
assert(_buf);
}
void BufferedReadStream::allocBuf(uint32 bufSize) {
_buf = new byte[bufSize];
assert(_buf);
}
BufferedReadStream::~BufferedReadStream() {
if (_disposeParentStream)
delete _parentStream;
deallocBuf();
}
void BufferedReadStream::deallocBuf() {
delete[] _buf;
}
@ -334,7 +326,7 @@ BufferedWriteStream::BufferedWriteStream(WriteStream *parentStream, uint32 bufSi
_bufSize(bufSize) {
assert(parentStream);
allocBuf(bufSize);
_buf = new byte[bufSize];
assert(_buf);
}
@ -344,14 +336,6 @@ BufferedWriteStream::~BufferedWriteStream() {
if (_disposeParentStream)
delete _parentStream;
deallocBuf();
}
void BufferedWriteStream::allocBuf(uint32 bufSize) {
_buf = new byte[bufSize];
}
void BufferedWriteStream::deallocBuf() {
delete[] _buf;
}