diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-29 08:50:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-29 08:50:03 +0000 |
| commit | 10415ad38987373a6ba6d31f40af83b9d9d3aa1e (patch) | |
| tree | 14c78af0c6b895e5b906ad7072f5453507a7c38f | |
| parent | 6467ac846a14508ba5d3224dd9db29362ce86b94 (diff) | |
| download | ATCD-10415ad38987373a6ba6d31f40af83b9d9d3aa1e.tar.gz | |
Thu Nov 29 08:49:39 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CDR_Stream.cpp:
Removed arm handling here, gets handled at a lower layer
already
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/CDR_Stream.cpp | 19 |
2 files changed, 9 insertions, 16 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 03f99f2a467..077faa5b3eb 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 29 08:49:39 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Stream.cpp: + Removed arm handling here, gets handled at a lower layer + already + Wed Nov 28 09:34:00 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * debian/libace-dev.install: diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 3dedd83cc33..7aeb4a9f4b1 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -531,22 +531,10 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x) if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0) { -#if defined (__arm__) && !defined (ACE_HAS_IPHONE) - // Convert to Intel format (12345678 => 56781234) - const char *orig = reinterpret_cast<const char *> (x); - char *target = buf; - register ACE_UINT32 x = - *reinterpret_cast<const ACE_UINT32 *> (orig); - register ACE_UINT32 y = - *reinterpret_cast<const ACE_UINT32 *> (orig + 4); - *reinterpret_cast<ACE_UINT32 *> (target) = y; - *reinterpret_cast<ACE_UINT32 *> (target + 4) = x; - return true; -#else -# if !defined (ACE_ENABLE_SWAP_ON_WRITE) +#if !defined (ACE_ENABLE_SWAP_ON_WRITE) *reinterpret_cast<ACE_CDR::ULongLong *> (buf) = *x; return true; -# else +#else if (!this->do_byte_swap_) { *reinterpret_cast<ACE_CDR::ULongLong *> (buf) = *x; @@ -557,8 +545,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x) ACE_CDR::swap_8 (reinterpret_cast<const char*> (x), buf); return true; } -# endif /* ACE_ENABLE_SWAP_ON_WRITE */ -#endif /* !__arm__ */ +#endif /* ACE_ENABLE_SWAP_ON_WRITE */ } return false; |