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

23
dep/ACE_wrappers/ace/CDR_Stream.cpp
View file

@ -1,3 +1,5 @@
// $Id: CDR_Stream.cpp 91373 2010-08-17 07:35:27Z mhengstmengel $
#include "ace/CDR_Stream.h"
#include "ace/SString.h"
#include "ace/Auto_Ptr.h"
@ -7,10 +9,6 @@
# include "ace/CDR_Stream.inl"
#endif /* ! __ACE_INLINE__ */
ACE_RCSID (ace,
CDR_Stream,
"$Id: CDR_Stream.cpp 82559 2008-08-07 20:23:07Z parsons $")
// ****************************************************************
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -379,7 +377,7 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len,
this->write_ulong (
ACE_Utils::truncate_cast<ACE_CDR::ULong> (
ACE_OutputCDR::wchar_maxbytes_ * len));
if (good_ulong)
{
return this->write_wchar_array (x, len);
@ -533,7 +531,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
{
#if defined (__arm__)
#if defined (__arm__) && !defined (ACE_HAS_IPHONE)
// Convert to Intel format (12345678 => 56781234)
const char *orig = reinterpret_cast<const char *> (x);
char *target = buf;
@ -703,7 +701,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
return this->good_bit ();
}
char *
ACE_OutputCDR::write_long_placeholder (void)
{
@ -715,7 +712,6 @@ ACE_OutputCDR::write_long_placeholder (void)
return buf;
}
char *
ACE_OutputCDR::write_short_placeholder (void)
{
@ -727,7 +723,6 @@ ACE_OutputCDR::write_short_placeholder (void)
return buf;
}
ACE_CDR::Boolean
ACE_OutputCDR::replace (ACE_CDR::Long x, char* loc)
{
@ -1371,7 +1366,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
}
ACE_CDR::ULong len = 0;
if (!this->read_ulong (len))
{
return false;
@ -1615,7 +1610,7 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
{
#if !defined (ACE_DISABLE_SWAP_ON_READ)
# if defined (__arm__)
# if defined (__arm__) && !defined (ACE_HAS_IPHONE)
if (!this->do_byte_swap_)
{
// Convert from Intel format (12345678 => 56781234)
@ -1897,8 +1892,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
ACE_CDR::mb_align (&this->start_);
ACE_Data_Block *db =
this->start_.data_block ();
ACE_Data_Block *db = this->start_.data_block ();
// If the size of the data that needs to be copied are higher than
// what is available, then do a reallocation.
@ -1906,8 +1900,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
{
// @@NOTE: We need to probably add another method to the message
// block interface to simplify this
db =
cdr.start_.data_block ()->clone_nocopy ();
db = cdr.start_.data_block ()->clone_nocopy ();
if (db == 0 || db->size ((wr_bytes) +
ACE_CDR::MAX_ALIGNMENT) == -1)