third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc - Issue 6737030: third_party/protobuf: update to upstream r371

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/cpp/cpp_primitive_field.cc

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 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/compiler/cpp/cpp_plugin_unittest.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

index a69c48b5fa90ebfc8eaa7132919c6788db2865d7..5e8df0f49719de62f9f0d53ef9f14da03e1d9def 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

@@ -125,7 +125,7 @@ GenerateInlineAccessorDefinitions(io::Printer* printer) const {

" return $name$_;\n"

"}\n"

"inline void $classname$::set_$name$($type$ value) {\n"

- " _set_bit($index$);\n"

+ " set_has_$name$();\n"

" $name$_ = value;\n"

"}\n");

}

@@ -156,7 +156,7 @@ GenerateMergeFromCodedStream(io::Printer* printer) const {

"DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<\n"

" $type$, $wire_format_field_type$>(\n"

" input, &$name$_)));\n"

- "_set_bit($index$);\n");

+ "set_has_$name$();\n");

}

void PrimitiveFieldGenerator::