summaryrefslogtreecommitdiff
path: root/ace/Containers_T.cpp
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-20 22:58:45 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-20 22:58:45 +0000
commit7cefceccf3ef2fd9abd4489431b6e0eda26d213a (patch)
tree5be0b623f6f6d4d5603d714c689392560bb38a7e /ace/Containers_T.cpp
parent24f81f38982f658939fa14ae7719798b7c678444 (diff)
downloadATCD-7cefceccf3ef2fd9abd4489431b6e0eda26d213a.tar.gz
Thu May 20 17:47:35 1999 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'ace/Containers_T.cpp')
-rw-r--r--ace/Containers_T.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 9bd019ab70f..44ab889ab61 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -2350,9 +2350,10 @@ ACE_Array_Base<T>::operator= (const ACE_Array_Base<T> &s)
{
if (this->max_size_ < s.size ())
{
- ACE_DES_FREE (this->array_,
- this->allocator_->free,
- T);
+ ACE_DES_ARRAY_FREE (this->array_,
+ this->max_size_,
+ this->allocator_->free,
+ T);
ACE_NEW_MALLOC (this->array_,
(T *) this->allocator_->malloc (s.size () * sizeof (T)),
@@ -2416,10 +2417,11 @@ ACE_Array_Base<T>::max_size (size_t new_size)
// previously allocated section.
for (size_t j = this->cur_size_; j < new_size; j++)
new (&tmp[j]) T;
-
- ACE_DES_FREE (this->array_,
- this->allocator_->free,
- T);
+
+ ACE_DES_ARRAY_FREE (this->array_,
+ this->max_size_,
+ this->allocator_->free,
+ T);
this->array_ = tmp;
this->max_size_ = new_size;