Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146

Using binary one's complement to negate an unsigned int
pull/4630/head^2
Feng Xiao 7 years ago committed by GitHub
commit fe773bfe97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/google/protobuf/wire_format_lite.h

@ -860,7 +860,7 @@ inline uint32 WireFormatLite::ZigZagEncode32(int32 n) {
inline int32 WireFormatLite::ZigZagDecode32(uint32 n) {
// Note: Using unsigned types prevent undefined behavior
return static_cast<int32>((n >> 1) ^ -(n & 1));
return static_cast<int32>((n >> 1) ^ (~(n & 1) + 1));
}
inline uint64 WireFormatLite::ZigZagEncode64(int64 n) {
@ -871,7 +871,7 @@ inline uint64 WireFormatLite::ZigZagEncode64(int64 n) {
inline int64 WireFormatLite::ZigZagDecode64(uint64 n) {
// Note: Using unsigned types prevent undefined behavior
return static_cast<int64>((n >> 1) ^ -(n & 1));
return static_cast<int64>((n >> 1) ^ (~(n & 1) + 1));
}
// String is for UTF-8 text only, but, even so, ReadString() can simply

Loading…
Cancel
Save