summaryrefslogtreecommitdiff
path: root/ACE/ace/CDR_Stream.cpp
diff options
context:
space:
mode:
authorAbdullah Sowayan <sowayan@users.noreply.github.com>2010-01-21 23:19:50 +0000
committerAbdullah Sowayan <sowayan@users.noreply.github.com>2010-01-21 23:19:50 +0000
commitfebec9e1b570d1e5c77fdf6e60c514503a0503a7 (patch)
treeab80baed43c48b562516e1b0a62ba62bc3d70515 /ACE/ace/CDR_Stream.cpp
parent49c38ad1b137b15e5074e16028b04088aeaff215 (diff)
downloadATCD-febec9e1b570d1e5c77fdf6e60c514503a0503a7.tar.gz
Thu Jan 21 23:16:27 UTC 2010 Abdul Sowayan <sowayan@gmail.com>
Diffstat (limited to 'ACE/ace/CDR_Stream.cpp')
-rw-r--r--ACE/ace/CDR_Stream.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index f00a4c0c5b3..3d3975fc9aa 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -533,7 +533,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;
@@ -1612,7 +1612,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)