diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
| commit | ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b (patch) | |
| tree | 0e70d1f51c39e688a05a6cdc2af58408222e4a0d /ACE/ace/Malloc_T.inl | |
| parent | 5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff) | |
| download | ATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz | |
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/ace/Malloc_T.inl')
| -rw-r--r-- | ACE/ace/Malloc_T.inl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl index 55ee851d7ea..42321a18a4e 100644 --- a/ACE/ace/Malloc_T.inl +++ b/ACE/ace/Malloc_T.inl @@ -24,6 +24,8 @@ ACE_Cached_Mem_Pool_Node<T>::set_next (ACE_Cached_Mem_Pool_Node<T> *ptr) this->next_ = ptr; } +ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Cached_Mem_Pool_Node) + template <class T, class ACE_LOCK> ACE_INLINE size_t ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth (void) { @@ -64,7 +66,11 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::release (int close) this->memory_pool_.release (0); if (retv == 0) - this->remove (); + { + ace_mon.release (); + this->remove (); + } + return retv; } return -1; |