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: Local_Name_Space.cpp 91287 2010-08-05 10:30:49Z johnnyw $
#include "ace/Local_Name_Space.h"
#include "ace/ACE.h"
#include "ace/RW_Process_Mutex.h"
@ -10,11 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_NS_String::~ACE_NS_String (void)
{
if (this->delete_rep_)
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(this->rep_);
#else
delete [] this->rep_;
#endif /* ACE_HAS_ALLOC_HOOKS */
}
ACE_WCHAR_T *