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

9
dep/acelite/ace/Remote_Name_Space.cpp
View file

@ -1,3 +1,4 @@
// $Id: Remote_Name_Space.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Remote_Name_Space.h"
#include "ace/Auto_Ptr.h"
#include "ace/Log_Category.h"
@ -108,15 +109,9 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_WCHAR_T));
value = temp;
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_RETURN (type,
static_cast<char*>(ACE_Allocator::instance()->malloc(sizeof(char) * (reply.type_len () + 1))),
-1);
#else
ACE_NEW_RETURN (type,
char[reply.type_len () + 1],
-1);
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_OS::strcpy (type, reply.type ());
return 0;
}
@ -367,8 +362,6 @@ ACE_Remote_Name_Space::~ACE_Remote_Name_Space (void)
ACE_TRACE ("ACE_Remote_Name_Space::~ACE_Remote_Name_Space");
}
ACE_ALLOC_HOOK_DEFINE(ACE_Remote_Name_Space)
void
ACE_Remote_Name_Space::dump (void) const
{