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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dep/ACE_wrappers/ace/CDR_Base.cpp
View file

@ -1,3 +1,5 @@
// $Id: CDR_Base.cpp 91287 2010-08-05 10:30:49Z johnnyw $
#include "ace/CDR_Base.h"
#if !defined (__ACE_INLINE__)
@ -8,10 +10,6 @@
#include "ace/OS_Memory.h"
#include "ace/OS_NS_string.h"
ACE_RCSID (ace,
CDR_Base,
"$Id: CDR_Base.cpp 80826 2008-03-04 14:51:23Z wotte $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (NONNATIVE_LONGDOUBLE)
@ -549,20 +547,22 @@ ACE_CDR::total_length (const ACE_Message_Block* begin,
return l;
}
void
int
ACE_CDR::consolidate (ACE_Message_Block *dst,
const ACE_Message_Block *src)
{
if (src == 0)
return;
return 0;
size_t newsize =
size_t const newsize =
ACE_CDR::first_size (ACE_CDR::total_length (src, 0)
+ ACE_CDR::MAX_ALIGNMENT);
dst->size (newsize);
if (dst->size (newsize) == -1)
return -1;
#if !defined (ACE_CDR_IGNORE_ALIGNMENT)
// We must copy the contents of <src> into the new buffer, but
// We must copy the contents of src into the new buffer, but
// respecting the alignment.
ptrdiff_t srcalign =
ptrdiff_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
@ -586,6 +586,7 @@ ACE_CDR::consolidate (ACE_Message_Block *dst,
else
dst->wr_ptr (i->length ());
}
return 0;
}
#if defined (NONNATIVE_LONGLONG)