diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 21:42:57 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-17 11:19:46 -0700 |
| commit | 818c5eee08840355d70d2f3bdf1a2f17986a5e70 (patch) | |
| tree | e6db0b1344385f8c48820c58d7297f653bff39f7 /src/google/protobuf/stubs/common.h | |
| parent | e96ff30120a3834f7d1e31e43e591bf7cfbd731f (diff) | |
Fix broken builds.
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 34d79f48..c3620146 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -50,8 +50,8 @@ #undef PROTOBUF_LITTLE_ENDIAN #ifdef _MSC_VER - #if defined(_M_IX86) && \ - !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) + // Assuming windows is always little-endian. + #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) #define PROTOBUF_LITTLE_ENDIAN 1 #endif #if _MSC_VER >= 1300 @@ -703,9 +703,11 @@ class LIBPROTOBUF_EXPORT LogMessage { LogMessage& operator<<(const char* value); LogMessage& operator<<(char value); LogMessage& operator<<(int value); - LogMessage& operator<<(uint value); + LogMessage& operator<<(unsigned int value); LogMessage& operator<<(long value); LogMessage& operator<<(unsigned long value); + LogMessage& operator<<(long long value); + LogMessage& operator<<(unsigned long long value); LogMessage& operator<<(double value); LogMessage& operator<<(void* value); LogMessage& operator<<(const StringPiece& value); |