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

15
dep/acelite/ace/SString.cpp
View file

@ -1,6 +1,9 @@
// $Id: SString.cpp 92580 2010-11-15 09:48:02Z johnnyw $
#include "ace/Malloc_T.h"
#include "ace/OS_Memory.h"
#include "ace/SString.h"
#include "ace/Auto_Ptr.h"
#include "ace/OS_NS_string.h"
#include "ace/Numeric_Limits.h"
@ -62,15 +65,9 @@ ACE_NS_WString::char_rep (void) const
{
char *t = 0;
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_RETURN (t,
static_cast<char*>(ACE_Allocator::instance()->malloc (sizeof (char) * (this->len_ + 1))),
0);
#else
ACE_NEW_RETURN (t,
char[this->len_ + 1],
0);
#endif
for (size_type i = 0; i < this->len_; ++i)
// Note that this cast may lose data if wide chars are
@ -92,15 +89,9 @@ ACE_NS_WString::ushort_rep (void) const
{
ACE_UINT16 *t = 0;
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_RETURN (t,
static_cast<ACE_UINT16*> (ACE_Allocator::instance()->malloc(sizeof(ACE_UINT16) * (this->len_ + 1))),
0);
#else
ACE_NEW_RETURN (t,
ACE_UINT16[this->len_ + 1],
0);
#endif
for (size_type i = 0; i < this->len_; ++i)
// Note that this cast may lose data if wide chars are