mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +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_Object.cpp
View file

@ -1,9 +1,8 @@
// $Id: Service_Object.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/config-all.h"
#include "ace/Service_Object.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
#if !defined (__ACE_INLINE__)
#include "ace/Service_Object.inl"
@ -30,11 +29,11 @@ ACE_Service_Type::dump (void) const
ACE_TRACE ("ACE_Service_Type::dump");
#endif /* ACE_HAS_DUMP */
// Using printf, since the log facility may not have been
// initialized yet. Using a "//" prefix, in case the executable
// happens to be a code generator and the output gets embedded in
// the generated C++ code.
#ifndef ACE_LACKS_STDERR
ACE_OS::fprintf(stderr,
"// [ST] dump, this=%p, name=%s, type=%p, so=%p, active=%d\n",
static_cast<void const *> (this),
@ -42,7 +41,7 @@ ACE_Service_Type::dump (void) const
static_cast<void const *> (this->type_),
(this->type_ != 0) ? this->type_->object () : 0,
this->active_);
#endif
}
ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
@ -78,11 +77,7 @@ ACE_Service_Type::~ACE_Service_Type (void)
ACE_TRACE ("ACE_Service_Type::~ACE_Service_Type");
this->fini ();
#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 */
}
int
@ -168,12 +163,7 @@ ACE_Service_Type::name (const ACE_TCHAR *n)
{
ACE_TRACE ("ACE_Service_Type::name");
#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 */
this->name_ = ACE::strnew (n);
}