mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +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

18
dep/acelite/ace/Service_Gestalt.cpp
View file

@ -1,3 +1,5 @@
// $Id: Service_Gestalt.cpp 97798 2014-07-03 10:57:43Z johnnyw $
#include "ace/Svc_Conf.h"
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
@ -132,25 +134,15 @@ Processed_Static_Svc (const ACE_Static_Svc_Descriptor *assd)
:name_(0),
assd_(assd)
{
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_NORETURN (name_, static_cast<ACE_TCHAR*>(ACE_Allocator::instance()->malloc (sizeof(ACE_TCHAR) * (ACE_OS::strlen(assd->name_)+1))));
#else
ACE_NEW_NORETURN (name_, ACE_TCHAR[ACE_OS::strlen(assd->name_)+1]);
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_OS::strcpy(name_,assd->name_);
}
ACE_Service_Gestalt::Processed_Static_Svc::~Processed_Static_Svc (void)
{
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(name_);
#else
delete [] name_;
#endif /* ACE_HAS_ALLOC_HOOKS */
}
ACE_ALLOC_HOOK_DEFINE(ACE_Service_Gestalt::Processed_Static_Svc)
void
ACE_Service_Gestalt::intrusive_add_ref (ACE_Service_Gestalt* g)
{
@ -358,7 +350,7 @@ ACE_Service_Gestalt::add_processed_static_svc
/// associates a service object with the Gestalt and makes the
/// resource (a Service Object) local to the repository. This is but
/// the first step in using such SO. The next is the
/// "initialization" step. It is typically done through a "static"
/// "initialization" step. It is typicaly done through a "static"
/// service configuration directive.
///
/// In contrast a "dynamic" directive, when processed through the
@ -789,6 +781,10 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param)
: param->source.directive));
#endif
// AC 970827 Skip the heap check because yacc allocates a buffer
// here which will be reported as a memory leak for some reason.
ACE_NO_HEAP_CHECK
// Were we called in the context of the current instance?
ACE_ASSERT (this == param->config);