diff options
Diffstat (limited to 'ACE/ace/CDR_Stream.cpp')
-rw-r--r-- | ACE/ace/CDR_Stream.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index f00a4c0c5b3..7307cba4759 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "ace/CDR_Stream.h" #include "ace/SString.h" #include "ace/Auto_Ptr.h" @@ -7,10 +9,6 @@ # include "ace/CDR_Stream.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (ace, - CDR_Stream, - "$Id$") - // **************************************************************** ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -533,7 +531,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 +1610,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) |