diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2006-10-26 17:10:07 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2006-10-26 17:10:07 +0000 |
commit | 7866175bc5d5952b92c98b2c6844738bbeb20a4d (patch) | |
tree | b604a1b9f0e869a91df900a71ac5c9abff9ff4f8 /cppe/src | |
parent | Makefile.mak cleanup (diff) | |
download | ice-7866175bc5d5952b92c98b2c6844738bbeb20a4d.tar.bz2 ice-7866175bc5d5952b92c98b2c6844738bbeb20a4d.tar.xz ice-7866175bc5d5952b92c98b2c6844738bbeb20a4d.zip |
Bug 1366 - buffer max size
Diffstat (limited to 'cppe/src')
-rw-r--r-- | cppe/src/IceE/Buffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cppe/src/IceE/Buffer.cpp b/cppe/src/IceE/Buffer.cpp index c6b758b3a5b..e1e98952ebe 100644 --- a/cppe/src/IceE/Buffer.cpp +++ b/cppe/src/IceE/Buffer.cpp @@ -95,7 +95,7 @@ IceInternal::Buffer::Container::reserve(size_type n) { if(n > _capacity) { - _capacity = std::max<size_type>(n, 2 * _capacity); + _capacity = std::max<size_type>(n, std::min(2 * _capacity, _maxCapacity)); _capacity = std::max<size_type>(static_cast<size_type>(240), _capacity); } else if(n < _capacity) |