diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-23 19:46:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 19:46:22 +0200 |
| commit | ba8b11bd555bb7dff95cf57db41ae459cd6db4b1 (patch) | |
| tree | 39b7e1152932cb38c6c171e2632f1bd7f91b978d | |
| parent | a6897f92e027038856e654a1d2bf03ac3afc93db (diff) | |
| parent | a4bd31722e875ef8ab91cebfbe430cb86fa68ccf (diff) | |
| download | ATCD-ba8b11bd555bb7dff95cf57db41ae459cd6db4b1.tar.gz | |
Merge pull request #435 from jwillemsen/master
Fixed solaris compile errors
| -rw-r--r-- | ACE/ace/CDR_Base.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index 20cacf2ce46..d66a0625eba 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -185,10 +185,10 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) a = (a1 | a2); - b1 = static_cast<ACE_UINT16> (a >> 48); - b2 = static_cast<ACE_UINT16> ((a >> 32) & 0xffff); - b3 = static_cast<ACE_UINT16> ((a >> 16) & 0xffff); - b4 = static_cast<ACE_UINT16> (a & 0xffff); + ACE_UINT16 b1 = static_cast<ACE_UINT16> (a >> 48); + ACE_UINT16 b2 = static_cast<ACE_UINT16> ((a >> 32) & 0xffff); + ACE_UINT16 b3 = static_cast<ACE_UINT16> ((a >> 16) & 0xffff); + ACE_UINT16 b4 = static_cast<ACE_UINT16> (a & 0xffff); #if defined(ACE_LITTLE_ENDIAN) * reinterpret_cast<ACE_UINT16*> (target) = b4; |