Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: DLL.cpp 97888 2014-09-11 10:29:17Z mcorino $
#include "ace/DLL.h"
#include "ace/Log_Category.h"
@ -101,11 +103,7 @@ ACE_DLL::~ACE_DLL (void)
// occur if full ACE_DLL initialization is interrupted due to errors
// (e.g. attempting to open a DSO/DLL that does not exist). Make
// sure this->dll_name_ is deallocated.
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free (this->dll_name_);
#else
delete [] this->dll_name_;
#endif /* ACE_HAS_ALLOC_HOOKS */
}
// This method opens the library based on the mode specified using the
@ -225,11 +223,7 @@ ACE_DLL::close (void)
// Even if close_dll() failed, go ahead and cleanup.
this->dll_handle_ = 0;
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free (this->dll_name_);
#else
delete [] this->dll_name_;
#endif /* ACE_HAS_ALLOC_HOOKS */
this->dll_name_ = 0;
this->close_handle_on_destruction_ = false;