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/Buffer.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/Buffer.cpp')
| -rw-r--r-- | cpp/src/Ice/Buffer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp index 8da1b4ab2f2..33c6858aefb 100644 --- a/cpp/src/Ice/Buffer.cpp +++ b/cpp/src/Ice/Buffer.cpp @@ -21,11 +21,10 @@ IceInternal::Buffer::swapBuffer(Buffer& other) std::swap(i, other.i); } -IceInternal::Buffer::Container::Container(size_type maxCapacity) : +IceInternal::Buffer::Container::Container() : _buf(0), _size(0), _capacity(0), - _maxCapacity(maxCapacity), _shrinkCounter(0) { } @@ -34,7 +33,6 @@ IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end _buf(const_cast<iterator>(beg)), _size(end - beg), _capacity(0), - _maxCapacity(0), _shrinkCounter(0) { } @@ -78,7 +76,7 @@ IceInternal::Buffer::Container::reserve(size_type n) size_type c = _capacity; if(n > _capacity) { - _capacity = std::max<size_type>(n, std::min(2 * _capacity, _maxCapacity)); + _capacity = std::max<size_type>(n, 2 * _capacity); _capacity = std::max<size_type>(static_cast<size_type>(240), _capacity); } else if(n < _capacity) |