diff options
| author | Jose <jose@zeroc.com> | 2013-09-02 22:24:49 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-09-02 22:24:49 +0200 |
| commit | e884d79c7ef077cc33b8490955ace293a961d968 (patch) | |
| tree | 76d3b97ad985742f72da3862159701aff6640d7a /cpp/src/Ice/BasicStream.cpp | |
| parent | Minor makedist correction (diff) | |
| download | ice-e884d79c7ef077cc33b8490955ace293a961d968.tar.bz2 ice-e884d79c7ef077cc33b8490955ace293a961d968.tar.xz ice-e884d79c7ef077cc33b8490955ace293a961d968.zip | |
Fixed ICE-5400 - Ice & IceE arm double format
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index a0aedb08044..2651c6ecafd 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1117,7 +1117,7 @@ IceInternal::BasicStream::write(Double v) *dest = *src; #else const Byte* src = reinterpret_cast<const Byte*>(&v); -# if defined(__arm__) && defined(__linux) +# if defined(ICE_LITTLEBYTE_BIGWORD) dest[4] = *src++; dest[5] = *src++; dest[6] = *src++; @@ -1163,7 +1163,7 @@ IceInternal::BasicStream::write(const Double* begin, const Double* end) *dest++ = *src--; src += 2 * sizeof(Double); } -#elif defined(__arm__) && defined(__linux) +#elif defined(ICE_LITTLEBYTE_BIGWORD) const Byte* src = reinterpret_cast<const Byte*>(begin); Byte* dest = &(*(b.begin() + pos)); for(int j = 0 ; j < sz ; ++j) @@ -1205,7 +1205,7 @@ IceInternal::BasicStream::read(Double& v) *dest = *src; #else Byte* dest = reinterpret_cast<Byte*>(&v); -# if defined(__arm__) && defined(__linux) +# if defined(ICE_LITTLEBYTE_BIGWORD) dest[4] = *src++; dest[5] = *src++; dest[6] = *src++; @@ -1251,7 +1251,7 @@ IceInternal::BasicStream::read(vector<Double>& v) *dest-- = *src++; dest += 2 * sizeof(Double); } -#elif defined(__arm__) && defined(__linux) +#elif defined(ICE_LITTLEBYTE_BIGWORD) const Byte* src = &(*begin); Byte* dest = reinterpret_cast<Byte*>(&v[0]); for(int j = 0 ; j < sz ; ++j) @@ -1308,7 +1308,7 @@ IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::S *dest-- = *src++; dest += 2 * sizeof(Double); } -# elif defined(__arm__) && defined(__linux) +# elif defined(ICE_LITTLEBYTE_BIGWORD) const Byte* src = &(*begin); Byte* dest = reinterpret_cast<Byte*>(&result[0]); for(int j = 0 ; j < sz ; ++j) |