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,4 +1,6 @@
// Name_Space.cpp
// $Id: Name_Space.cpp 91286 2010-08-05 09:04:31Z johnnyw $
#include "ace/Name_Space.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdlib.h"
@ -19,11 +21,7 @@ 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,
@ -51,11 +49,7 @@ 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_);