mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
[10874] Update ACE to v5.8.3
(based on zergtmn's repo commit 3a8c259) (based on zergtmn's repo commit 946c1a8) Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
c38c876b1d
commit
b8d773091a
343 changed files with 3060 additions and 7431 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// $Id: CDR_Size.cpp 91287 2010-08-05 10:30:49Z johnnyw $
|
||||
// $Id: CDR_Size.cpp 91813 2010-09-17 07:52:52Z johnnyw $
|
||||
|
||||
#include "ace/CDR_Size.h"
|
||||
#include "ace/SString.h"
|
||||
|
|
@ -21,13 +21,13 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
|||
errno = EACCES;
|
||||
return (this->good_bit_ = false);
|
||||
}
|
||||
|
||||
|
||||
if (static_cast<ACE_CDR::Short> (major_version_) == 1
|
||||
&& static_cast<ACE_CDR::Short> (minor_version_) == 2)
|
||||
{
|
||||
ACE_CDR::Octet len =
|
||||
static_cast<ACE_CDR::Octet> (ACE_OutputCDR::wchar_maxbytes ());
|
||||
|
||||
|
||||
if (this->write_1 (&len))
|
||||
{
|
||||
if (ACE_OutputCDR::wchar_maxbytes () == sizeof(ACE_CDR::WChar))
|
||||
|
|
@ -63,7 +63,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
|||
errno = EINVAL;
|
||||
return (this->good_bit_ = false);
|
||||
}
|
||||
|
||||
|
||||
if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar))
|
||||
{
|
||||
const void *temp = &x;
|
||||
|
|
@ -74,7 +74,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
|||
ACE_CDR::Short sx = static_cast<ACE_CDR::Short> (x);
|
||||
return this->write_2 (reinterpret_cast<const ACE_CDR::UShort *> (&sx));
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Octet ox = static_cast<ACE_CDR::Octet> (x);
|
||||
return this->write_1 (reinterpret_cast<const ACE_CDR::Octet *> (&ox));
|
||||
}
|
||||
|
|
@ -136,9 +136,9 @@ ACE_SizeCDR::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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue