aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBastien Bouclet2017-09-24 06:21:54 +0200
committerGitHub2017-09-24 06:21:54 +0200
commit25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf (patch)
tree9b28c0382e0c7362e2d88e73b8e312f8a8bbbdd8 /common
parent75026dba8cb3a9870e1e8f35b2625410ff49a131 (diff)
parentbe67f0d8bfb4148e014931cce63b52e84ed95ee6 (diff)
downloadscummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.tar.gz
scummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.tar.bz2
scummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.zip
Merge pull request #1027 from bgK/memstream-default-arg
COMMON: Remove the DisposeAfterUse default value from dynamic write memory streams constructors
Diffstat (limited to 'common')
-rw-r--r--common/memstream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/memstream.h b/common/memstream.h
index 0338d35378..f6bf990208 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -184,7 +184,7 @@ protected:
_size = new_len;
}
public:
- MemoryWriteStreamDynamic(DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO) : _capacity(0), _size(0), _ptr(0), _data(0), _pos(0), _disposeMemory(disposeMemory) {}
+ explicit MemoryWriteStreamDynamic(DisposeAfterUse::Flag disposeMemory) : _capacity(0), _size(0), _ptr(0), _data(0), _pos(0), _disposeMemory(disposeMemory) {}
~MemoryWriteStreamDynamic() {
if (_disposeMemory)
@@ -247,7 +247,7 @@ private:
}
}
public:
- MemoryReadWriteStream(DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO) : _capacity(0), _size(0), _data(0), _writePos(0), _readPos(0), _pos(0), _length(0), _disposeMemory(disposeMemory), _eos(false) {}
+ explicit MemoryReadWriteStream(DisposeAfterUse::Flag disposeMemory) : _capacity(0), _size(0), _data(0), _writePos(0), _readPos(0), _pos(0), _length(0), _disposeMemory(disposeMemory), _eos(false) {}
~MemoryReadWriteStream() {
if (_disposeMemory)