mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

32
dep/acelite/ace/Parse_Node.cpp
View file

@ -1,3 +1,4 @@
// $Id: Parse_Node.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Parse_Node.h"
#if (ACE_USES_CLASSIC_SVC_CONF == 1)
@ -47,20 +48,14 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
// reverse order from the way they should be pushed onto the stream.
// So traverse mods_ and and reverse the list, then iterate over it to push
// the modules in the stream in the correct order.
#if defined (ACE_HAS_ALLOC_HOOKS)
typedef std::list<const ACE_Static_Node *,
ACE_Allocator_Std_Adapter<const ACE_Static_Node *> > list_t;
#else
typedef std::list<const ACE_Static_Node *> list_t;
#endif /* ACE_HAS_ALLOC_HOOKS */
list_t mod_list;
std::list<const ACE_Static_Node *> mod_list;
const ACE_Static_Node *module;
for (module = dynamic_cast<const ACE_Static_Node*> (this->mods_);
module != 0;
module = dynamic_cast<ACE_Static_Node*> (module->link()))
mod_list.push_front (module);
list_t::const_iterator iter;
std::list<const ACE_Static_Node *>::const_iterator iter;
for (iter = mod_list.begin (); iter != mod_list.end (); ++iter)
{
module = *iter;
@ -198,11 +193,7 @@ ACE_Parse_Node::print (void) const
ACE_Parse_Node::~ACE_Parse_Node (void)
{
ACE_TRACE ("ACE_Parse_Node::~ACE_Parse_Node");
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(const_cast<ACE_TCHAR*> (this->name_));
#else
delete[] const_cast<ACE_TCHAR*> (this->name_);
#endif /* ACE_HAS_ALLOC_HOOKS */
delete this->next_;
}
@ -419,11 +410,7 @@ ACE_Static_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
ACE_Static_Node::~ACE_Static_Node (void)
{
ACE_TRACE ("ACE_Static_Node::~ACE_Static_Node");
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(this->parameters_);
#else
delete[] this->parameters_;
#endif /* ACE_HAS_ALLOC_HOOKS */
}
@ -577,11 +564,7 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *,
ACE_Object_Node::~ACE_Object_Node (void)
{
ACE_TRACE ("ACE_Object_Node::~ACE_Object_Node");
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(const_cast<ACE_TCHAR *> (this->object_name_));
#else
delete[] const_cast<ACE_TCHAR *> (this->object_name_);
#endif /* ACE_HAS_ALLOC_HOOKS */
}
ACE_ALLOC_HOOK_DEFINE (ACE_Function_Node)
@ -731,13 +714,8 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
ACE_Function_Node::~ACE_Function_Node (void)
{
ACE_TRACE ("ACE_Function_Node::~ACE_Function_Node");
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(const_cast<ACE_TCHAR *> (function_name_));
ACE_Allocator::instance()->free(const_cast<ACE_TCHAR *> (pathname_));
#else
delete[] const_cast<ACE_TCHAR *> (function_name_);
delete[] const_cast<ACE_TCHAR *> (pathname_);
#endif /* ACE_HAS_ALLOC_HOOKS */
}
ACE_ALLOC_HOOK_DEFINE (ACE_Dummy_Node)
@ -867,11 +845,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config,
ACE_Static_Function_Node::~ACE_Static_Function_Node (void)
{
ACE_TRACE ("ACE_Static_Function_Node::~ACE_Static_Function_Node");
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(const_cast<ACE_TCHAR *> (function_name_));
#else
delete[] const_cast<ACE_TCHAR *> (this->function_name_);
#endif /* ACE_HAS_ALLOC_HOOKS */
}
ACE_ALLOC_HOOK_DEFINE (ACE_Service_Type_Factory)