mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Some missing from merge.
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
parent
ec939a5bce
commit
f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
|
|
@ -1,3 +1,5 @@
|
|||
// $Id: Dirent_Selector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
|
||||
|
||||
#include "ace/Dirent_Selector.h"
|
||||
|
||||
#if !defined (__ACE_INLINE__)
|
||||
|
|
@ -7,10 +9,6 @@
|
|||
#include "ace/OS_NS_dirent.h"
|
||||
#include "ace/OS_NS_stdlib.h"
|
||||
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
# include "ace/Malloc_Base.h"
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
// Construction/Destruction
|
||||
|
|
@ -44,24 +42,12 @@ ACE_Dirent_Selector::close (void)
|
|||
#if defined (ACE_LACKS_STRUCT_DIR)
|
||||
// Only the lacking-struct-dir emulation allocates this. Native
|
||||
// scandir includes d_name in the dirent struct itself.
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
ACE_Allocator::instance()->free (this->namelist_[n_]->d_name);
|
||||
#else
|
||||
ACE_OS::free (this->namelist_[n_]->d_name);
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
#endif
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
ACE_Allocator::instance()->free (this->namelist_[n_]);
|
||||
#else
|
||||
ACE_OS::free (this->namelist_[n_]);
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
}
|
||||
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
ACE_Allocator::instance()->free (this->namelist_);
|
||||
#else
|
||||
ACE_OS::free (this->namelist_);
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
this->namelist_ = 0;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue