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/Name_Space.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/Name_Space.cpp')
| -rw-r--r-- | ACE/ace/Name_Space.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ace/Name_Space.cpp b/ACE/ace/Name_Space.cpp index 2f61a10dbd8..403f473bdb1 100644 --- a/ACE/ace/Name_Space.cpp +++ b/ACE/ace/Name_Space.cpp @@ -19,7 +19,11 @@ ACE_Name_Binding::ACE_Name_Binding (void) ACE_Name_Binding::~ACE_Name_Binding (void) { ACE_TRACE ("ACE_Name_Binding::~ACE_Name_Binding"); +#if defined (ACE_HAS_ALLOC_HOOKS) + ACE_Allocator::instance()->free ((void *) this->type_); +#else ACE_OS::free ((void *) this->type_); +#endif /* ACE_HAS_ALLOC_HOOKS */ } ACE_Name_Binding::ACE_Name_Binding (const ACE_NS_WString &name, @@ -47,7 +51,11 @@ ACE_Name_Binding::operator = (const ACE_Name_Binding &s) if (this != &s) { +#if defined (ACE_HAS_ALLOC_HOOKS) + ACE_Allocator::instance()->free ((void *) this->type_); +#else ACE_OS::free ((void *) this->type_); +#endif /* ACE_HAS_ALLOC_HOOKS */ this->name_ = s.name_; this->value_ = s.value_; this->type_ = ACE_OS::strdup (s.type_); |