third_party/protobuf/src/google/protobuf/wire_format_lite.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/wire_format_lite.cc

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/util/message_differencer.cc ('k') | third_party/protobuf/src/google/protobuf/wire_format_lite_inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/wire_format_lite.cc

diff --git a/third_party/protobuf/src/google/protobuf/wire_format_lite.cc b/third_party/protobuf/src/google/protobuf/wire_format_lite.cc

index 7f1093c8f302444945d5580f51d745970c71de04..f2517074696e9958a15e9443e585a625627acab5 100644

--- a/third_party/protobuf/src/google/protobuf/wire_format_lite.cc

+++ b/third_party/protobuf/src/google/protobuf/wire_format_lite.cc

@@ -412,7 +412,7 @@ void WireFormatLite::WriteString(int field_number, const string& value,

io::CodedOutputStream* output) {

// String is for UTF-8 text only

WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);

- GOOGLE_CHECK(value.size() <= kint32max);

+ GOOGLE_CHECK_LE(value.size(), kint32max);

output->WriteVarint32(value.size());

output->WriteString(value);

}

@@ -421,14 +421,14 @@ void WireFormatLite::WriteStringMaybeAliased(

io::CodedOutputStream* output) {

// String is for UTF-8 text only

WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);

- GOOGLE_CHECK(value.size() <= kint32max);

+ GOOGLE_CHECK_LE(value.size(), kint32max);

output->WriteVarint32(value.size());

output->WriteRawMaybeAliased(value.data(), value.size());

}

void WireFormatLite::WriteBytes(int field_number, const string& value,

io::CodedOutputStream* output) {

WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);

- GOOGLE_CHECK(value.size() <= kint32max);

+ GOOGLE_CHECK_LE(value.size(), kint32max);

output->WriteVarint32(value.size());

output->WriteString(value);

}

@@ -436,7 +436,7 @@ void WireFormatLite::WriteBytesMaybeAliased(

int field_number, const string& value,

io::CodedOutputStream* output) {

WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);

- GOOGLE_CHECK(value.size() <= kint32max);

+ GOOGLE_CHECK_LE(value.size(), kint32max);

output->WriteVarint32(value.size());

output->WriteRawMaybeAliased(value.data(), value.size());

}