diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-04-11 12:20:29 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-04-11 12:20:29 +0000 |
| commit | e8b4df7a217492ee9a687922b6d97dba7db6c9c4 (patch) | |
| tree | ad060c96556839faebbe4c802d3bf883218c0c21 /cppe/src/IceE/BasicStream.cpp | |
| parent | Port for gumstix (diff) | |
| download | ice-e8b4df7a217492ee9a687922b6d97dba7db6c9c4.tar.bz2 ice-e8b4df7a217492ee9a687922b6d97dba7db6c9c4.tar.xz ice-e8b4df7a217492ee9a687922b6d97dba7db6c9c4.zip | |
Fixed define for Linux on ARM
Diffstat (limited to 'cppe/src/IceE/BasicStream.cpp')
| -rw-r--r-- | cppe/src/IceE/BasicStream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp index 534a438d220..56e77dddcdf 100644 --- a/cppe/src/IceE/BasicStream.cpp +++ b/cppe/src/IceE/BasicStream.cpp @@ -1073,7 +1073,7 @@ IceInternal::BasicStream::write(Double v) *dest = *src; #else const Byte* src = reinterpret_cast<const Byte*>(&v); -# if defined(_ARM_) && defined(__linux) +# if defined(__arm__) && defined(__linux) dest[4] = *src++; dest[5] = *src++; dest[6] = *src++; @@ -1116,7 +1116,7 @@ IceInternal::BasicStream::read(Double& v) *dest = *src; #else Byte* dest = reinterpret_cast<Byte*>(&v); -# if defined(_ARM_) && defined(__linux) +# if defined(__arm__) && defined(__linux) dest[4] = *src++; dest[5] = *src++; dest[6] = *src++; @@ -1162,7 +1162,7 @@ IceInternal::BasicStream::write(const Double* begin, const Double* end) *dest++ = *src--; src += 2 * sizeof(Double); } -#elif defined(_ARM_) && defined(__linux) +#elif defined(__arm__) && defined(__linux) const Byte* src = reinterpret_cast<const Byte*>(begin); Byte* dest = &(*(b.begin() + pos)); for(int j = 0 ; j < sz ; ++j) @@ -1209,7 +1209,7 @@ IceInternal::BasicStream::read(vector<Double>& v) *dest-- = *src++; dest += 2 * sizeof(Double); } -#elif defined(_ARM_) && defined(__linux) +#elif defined(__arm__) && defined(__linux) const Byte* src = &(*begin); Byte* dest = reinterpret_cast<Byte*>(&v[0]); for(int j = 0 ; j < sz ; ++j) |