diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-04-23 13:41:26 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-04-23 13:41:26 +0000 |
commit | 72c236150151c8c60cd22dc28302252f82aefe12 (patch) | |
tree | 882a6a3ccd337ab4e363d7b9c3a2f6a469b83f76 /ACE/ace/CDR_Base.inl | |
parent | 3a644fedfaf4bbdbfa8ed75c0f10984cb7a684b8 (diff) | |
download | ATCD-72c236150151c8c60cd22dc28302252f82aefe12.tar.gz |
Mon Apr 23 13:39:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/CDR_Base.inl')
-rw-r--r-- | ACE/ace/CDR_Base.inl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl index 255244aceb3..818bab89301 100644 --- a/ACE/ace/CDR_Base.inl +++ b/ACE/ace/CDR_Base.inl @@ -102,8 +102,8 @@ ACE_CDR::swap_4 (const char* orig, char* target) *reinterpret_cast<unsigned long *> (target) = _byteswap_ulong (*reinterpret_cast<unsigned long const *> (orig)); #elif defined (ACE_HAS_BSWAP_32) - *reinterpret_cast<unsigned short *> (target) = - bswap_32 (*reinterpret_cast<unsigned short const *> (orig)); + *reinterpret_cast<unsigned int *> (target) = + bswap_32 (*reinterpret_cast<unsigned int const *> (orig)); #elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__)) && defined(__GNUG__) // We have ACE_HAS_PENTIUM, so we know the sizeof's. register unsigned int j = @@ -134,8 +134,8 @@ ACE_CDR::swap_8 (const char* orig, char* target) *reinterpret_cast<unsigned __int64 *> (target) = _byteswap_uint64 (*reinterpret_cast<unsigned __int64 const *> (orig)); #elif defined (ACE_HAS_BSWAP_64) - *reinterpret_cast<unsigned short *> (target) = - bswap_64 (*reinterpret_cast<unsigned short const *> (orig)); + *reinterpret_cast<unsigned long *> (target) = + bswap_64 (*reinterpret_cast<unsigned long const *> (orig)); #elif defined(__amd64__) && defined(__GNUG__) register unsigned long x = * reinterpret_cast<const unsigned long*> (orig); |