diff options
author | Jose <jose@zeroc.com> | 2018-09-03 13:35:19 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-09-03 13:35:19 +0200 |
commit | ee5834c0d4a66217526975e68cd151ea3185b155 (patch) | |
tree | e402f100e1fc4c7f72f5a6590670d8fe9f4c63e5 /cpp | |
parent | Fixed whitespaces (diff) | |
download | ice-ee5834c0d4a66217526975e68cd151ea3185b155.tar.bz2 ice-ee5834c0d4a66217526975e68cd151ea3185b155.tar.xz ice-ee5834c0d4a66217526975e68cd151ea3185b155.zip |
Remove unused macro ICE_LITTLEBYTE_BIGWORD
Closes #187
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/Ice/InputStream.cpp | 42 | ||||
-rw-r--r-- | cpp/src/Ice/OutputStream.cpp | 26 |
2 files changed, 0 insertions, 68 deletions
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 143b1c5baa6..5b70f30b864 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -988,16 +988,6 @@ Ice::InputStream::read(Double& v) *dest = *src; #else Byte* dest = reinterpret_cast<Byte*>(&v); -# if defined(ICE_LITTLEBYTE_BIGWORD) - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src; -# else *dest++ = *src++; *dest++ = *src++; *dest++ = *src++; @@ -1006,7 +996,6 @@ Ice::InputStream::read(Double& v) *dest++ = *src++; *dest++ = *src++; *dest = *src; -# endif #endif } @@ -1034,21 +1023,6 @@ Ice::InputStream::read(vector<Double>& v) *dest-- = *src++; dest += 2 * sizeof(Double); } -#elif defined(ICE_LITTLEBYTE_BIGWORD) - const Byte* src = &(*begin); - Byte* dest = reinterpret_cast<Byte*>(&v[0]); - for(int j = 0 ; j < sz ; ++j) - { - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src++; - dest += sizeof(Double); - } #else copy(begin, i, reinterpret_cast<Byte*>(&v[0])); #endif @@ -1104,22 +1078,6 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr *dest-- = *src++; dest += 2 * sizeof(Double); } -# elif defined(ICE_LITTLEBYTE_BIGWORD) - const Byte* src = &(*begin); - Byte* dest = reinterpret_cast<Byte*>(&result[0]); - for(int j = 0 ; j < sz ; ++j) - { - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src++; - dest += sizeof(Double); - } - # else copy(begin, i, reinterpret_cast<Byte*>(&result[0])); # endif diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp index 578e4d4db82..74295648081 100644 --- a/cpp/src/Ice/OutputStream.cpp +++ b/cpp/src/Ice/OutputStream.cpp @@ -508,16 +508,6 @@ Ice::OutputStream::write(Double v) *dest = *src; #else const Byte* src = reinterpret_cast<const Byte*>(&v); -# if defined(ICE_LITTLEBYTE_BIGWORD) - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src; -# else *dest++ = *src++; *dest++ = *src++; *dest++ = *src++; @@ -526,7 +516,6 @@ Ice::OutputStream::write(Double v) *dest++ = *src++; *dest++ = *src++; *dest = *src; -# endif #endif } @@ -554,21 +543,6 @@ Ice::OutputStream::write(const Double* begin, const Double* end) *dest++ = *src--; src += 2 * sizeof(Double); } -#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) - { - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src++; - dest += sizeof(Double); - } #else memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double)); #endif |