diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-03 23:34:32 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-03 23:34:32 +0000 |
| commit | 09e45d3573d30ecea9fbeb94f24eaec8aef4dfe6 (patch) | |
| tree | 65fd89b91f1b58c2b14853b9fc7fe731936fa05e /ace | |
| parent | 70455b4c56eea99e06171dc595f564bf081ca7c4 (diff) | |
| download | ATCD-09e45d3573d30ecea9fbeb94f24eaec8aef4dfe6.tar.gz | |
ChangeLogTag:Thu Feb 3 11:38:15 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Malloc_T.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 8c6733ed215..10164b01e66 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -511,7 +511,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_find (const char *name) template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_bind (const char *name, - void *pointer) + void *pointer) { if (this->cb_ptr_ == 0) return -1; @@ -540,7 +540,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_bind (const char *name, template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::trybind (const char *name, - void *&pointer) + void *&pointer) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::trybind"); ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -560,8 +560,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::trybind (const char *name, template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bind (const char *name, - void *pointer, - int duplicates) + void *pointer, + int duplicates) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bind"); ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -661,6 +661,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::unbind (const char *name, void * else prev->next_ = curr->next_; + if (curr->next_ != 0) + curr->next_->prev_ = prev; + // This will free up both the node and the name due to our // clever trick in <bind>! this->shared_free (curr); @@ -815,7 +818,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_FIFO_I template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next (void *&next_entry, - const char *&name) + const char *&name) { ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next"); |