summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/Buffer.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/Ice/Buffer.h')
-rw-r--r--cpp/include/Ice/Buffer.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 5274950ede7..3cde5701a99 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -86,8 +86,6 @@ public:
void resize(size_type n) // Inlined for performance reasons.
{
- assert(!_buf || _capacity > 0);
-
if(n == 0)
{
clear();
@@ -101,14 +99,12 @@ public:
void reset()
{
- assert(!_buf || _capacity > 0);
-
if(_size > 0 && _size * 2 < _capacity)
{
//
// If the current buffer size is smaller than the
// buffer capacity, we shrink the buffer memory to the
- // current size. This is to avoid holding on too much
+ // current size. This is to avoid holding onto too much
// memory if it's not needed anymore.
//
if(++_shrinkCounter > 2)
@@ -152,6 +148,7 @@ public:
size_type _size;
size_type _capacity;
int _shrinkCounter;
+ bool _owned;
};
Container b;