diff options
| author |  brian-peloton <brian@peloton-tech.com> | 2017-05-23 16:22:57 -0700 |
|---|---|---|
| committer |  Feng Xiao <xfxyjwf@gmail.com> | 2017-05-23 16:22:57 -0700 |
| commit | 40da1ed572d60e9c7cc2fe1ca4175e30682f5a9d (patch) | |
| tree | 78c05eefc2a870be1ed053fe77d7f349f4cf1413 /src/google/protobuf/wire_format_lite.h | |
| parent | ba987a7e2d039107d304aa945fee662399461d58 (diff) | |
Removing undefined behavior and compiler warnings (#1315)
* Comment out unused arguments.
These last few are all that's needed to compile with -Wunused-arguments.
* Fix missing struct field initializer.
With this fix, everything compiles with -Wmissing-field-initializers.
* Add support for disabling unaligned memory accesses on x86 too.
ubsan doesn't like these because they are technically undefined
behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily.
* Avoid undefined integer overflow.
ubsan catches all of these.
Diffstat (limited to 'src/google/protobuf/wire_format_lite.h')
| -rw-r--r-- | src/google/protobuf/wire_format_lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_lite.h b/src/google/protobuf/wire_format_lite.h index 18b38eae..ce55f266 100644 --- a/src/google/protobuf/wire_format_lite.h +++ b/src/google/protobuf/wire_format_lite.h @@ -197,7 +197,7 @@ class LIBPROTOBUF_EXPORT WireFormatLite { // type-safe, though, so prefer it if possible. #define GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(FIELD_NUMBER, TYPE) \ static_cast<uint32>( \ - ((FIELD_NUMBER) << ::google::protobuf::internal::WireFormatLite::kTagTypeBits) \ + (static_cast<uint32>(FIELD_NUMBER) << ::google::protobuf::internal::WireFormatLite::kTagTypeBits) \ | (TYPE)) // These are the tags for the old MessageSet format, which was defined as: |