diff options
| author |  Bo Yang <teboring@google.com> | 2016-09-19 13:45:07 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:23:36 -0700 |
| commit | cc8ca5b6a5478b40546d4206392eb1471454460d (patch) | |
| tree | c0b45abfa16d7d373a6ea8f7fe50f1de00ab938e /src/google/protobuf/wire_format_lite.cc | |
| parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
Integrate internal changes
Diffstat (limited to 'src/google/protobuf/wire_format_lite.cc')
| -rw-r--r-- | src/google/protobuf/wire_format_lite.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_lite.cc b/src/google/protobuf/wire_format_lite.cc index 05cc0854..5bed7af4 100644 --- a/src/google/protobuf/wire_format_lite.cc +++ b/src/google/protobuf/wire_format_lite.cc @@ -61,7 +61,7 @@ const int WireFormatLite::kMessageSetMessageTag; #endif // IBM xlC requires prefixing constants with WireFormatLite:: -const int WireFormatLite::kMessageSetItemTagsSize = +const size_t WireFormatLite::kMessageSetItemTagsSize = io::CodedOutputStream::StaticVarintSize32< WireFormatLite::kMessageSetItemStartTag>::value + io::CodedOutputStream::StaticVarintSize32< |