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/Monitor_Base.cpp | |
parent | 5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff) | |
download | ATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz |
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/ace/Monitor_Base.cpp')
-rw-r--r-- | ACE/ace/Monitor_Base.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ACE/ace/Monitor_Base.cpp b/ACE/ace/Monitor_Base.cpp index 8538e168a56..c152ece18c9 100644 --- a/ACE/ace/Monitor_Base.cpp +++ b/ACE/ace/Monitor_Base.cpp @@ -2,6 +2,7 @@ #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) +#include "ace/ACE.h" #include "ace/Monitor_Admin_Manager.h" #include "ace/Monitor_Control_Action.h" #include "ace/Monitor_Point_Registry.h" @@ -35,7 +36,11 @@ namespace ACE { for (size_t i = 0UL; i < this->data_.index_; ++i) { +#if defined (ACE_HAS_ALLOC_HOOKS) + ACE_Allocator::instance()->free(this->data_.list_[i]); +#else delete [] this->data_.list_[i]; +#endif /* ACE_HAS_ALLOC_HOOKS */ } } } @@ -397,4 +402,3 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ - |