diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-05 15:33:01 +0100 |
| commit | cb4d5772e9a7a9228577df83027e45ec7de022ea (patch) | |
| tree | bd6489fe77ed5fba43adff613293d580fda8e0f3 /cpp/src/Ice/BasicStream.cpp | |
| parent | Fixed src tree build of IceJS (diff) | |
| download | ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.bz2 ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.tar.xz ice-cb4d5772e9a7a9228577df83027e45ec7de022ea.zip | |
Fixed ICE-5607: relaxed Ice.MessageSizeMax
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 2321bf1515e..683b230c1cb 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -88,16 +88,13 @@ const Byte FLAG_IS_LAST_SLICE = (1<<5); } -IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding, bool unlimited) : - IceInternal::Buffer(instance->messageSizeMax()), +IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding) : _instance(instance), _closure(0), _encoding(encoding), _currentReadEncaps(0), _currentWriteEncaps(0), _sliceObjects(true), - _messageSizeMax(_instance->messageSizeMax()), // Cached for efficiency. - _unlimited(unlimited), _stringConverter(instance->getStringConverter()), _wstringConverter(instance->getWstringConverter()), _startSeq(-1) @@ -119,8 +116,6 @@ IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& _currentReadEncaps(0), _currentWriteEncaps(0), _sliceObjects(true), - _messageSizeMax(_instance->messageSizeMax()), // Cached for efficiency. - _unlimited(false), _stringConverter(instance->getStringConverter()), _wstringConverter(instance->getWstringConverter()), _startSeq(-1) @@ -185,7 +180,6 @@ IceInternal::BasicStream::swap(BasicStream& other) resetEncaps(); other.resetEncaps(); - std::swap(_unlimited, other._unlimited); std::swap(_startSeq, other._startSeq); std::swap(_minSeqSize, other._minSeqSize); } |