third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/compiler/java/java_primitive_field.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month 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

« third_party/protobuf/patches/0011-uninline_internal_default_instance.patch ('K') | « third_party/protobuf/src/google/protobuf/compiler/java/java_options.h ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc

index e42ec2801fcb269a5f3de1d7d336549cdf4af8eb..877baf0a6381cd0d69a03c7cdd3d753dc8751a34 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc

@@ -777,8 +777,8 @@ GenerateSerializationCode(io::Printer* printer) const {

// That makes it safe to rely on the memoized size here.

printer->Print(variables_,

"if (get$capitalized_name$List().size() > 0) {\n"

- " output.writeRawVarint32($tag$);\n"

- " output.writeRawVarint32($name$MemoizedSerializedSize);\n"

+ " output.writeUInt32NoTag($tag$);\n"

+ " output.writeUInt32NoTag($name$MemoizedSerializedSize);\n"

"}\n"

"for (int i = 0; i < $name$_.size(); i++) {\n"

" output.write$capitalized_type$NoTag($name$_.get(i));\n"