Skip to content

P
protobuf
Commit 0acafda8 authored by liujisi@google.com's avatar liujisi@google.com
Browse files
Options

Fix byte encoding macros.

parent baac9c39
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/google/protobuf/io/coded_stream.h
View file @ 0acafda8
...@@ -782,8 +782,7 @@ inline const uint8* CodedInputStream::ReadLittleEndian64FromArray( ...@@ -782,8 +782,7 @@ inline const uint8* CodedInputStream::ReadLittleEndian64FromArray(
} }
inline bool CodedInputStream::ReadLittleEndian32(uint32* value) { inline bool CodedInputStream::ReadLittleEndian32(uint32* value) {
#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) && \ #if defined(PROTOBUF_LITTLE_ENDIAN)
defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN
if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) { if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {
memcpy(value, buffer_, sizeof(*value)); memcpy(value, buffer_, sizeof(*value));
Advance(sizeof(*value)); Advance(sizeof(*value));
...@@ -797,8 +796,7 @@ inline bool CodedInputStream::ReadLittleEndian32(uint32* value) { ...@@ -797,8 +796,7 @@ inline bool CodedInputStream::ReadLittleEndian32(uint32* value) {
} }
inline bool CodedInputStream::ReadLittleEndian64(uint64* value) { inline bool CodedInputStream::ReadLittleEndian64(uint64* value) {
#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) && \ #if defined(PROTOBUF_LITTLE_ENDIAN)
defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN
if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) { if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {
memcpy(value, buffer_, sizeof(*value)); memcpy(value, buffer_, sizeof(*value));
Advance(sizeof(*value)); Advance(sizeof(*value));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment