third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.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/compiler/cpp/cpp_field.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/compiler/cpp/cpp_field.h ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.h » ('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_field.cc

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

index 8d47d4e086999a2105f1aa244f62f9a5e4929b3f..b3ba3a2e5ad340c6bc09194be695b0a0889ace5d 100644

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

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

@@ -77,6 +77,8 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor,

WireFormat::TagSize(descriptor->number(), descriptor->type()));

(*variables)["deprecation"] = descriptor->options().deprecated()

? " PROTOBUF_DEPRECATED" : "";

+ (*variables)["deprecated_attr"] = descriptor->options().deprecated()

+ ? "PROTOBUF_DEPRECATED_ATTR " : "";

(*variables)["cppget"] = "Get";

@@ -121,6 +123,7 @@ GenerateMergeFromCodedStreamWithPacking(io::Printer* printer) const {

FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor,

const Options& options)

: descriptor_(descriptor),

+ options_(options),

field_generators_(

new google::protobuf::scoped_ptr<FieldGenerator>[descriptor->field_count()]) {

// Construct all the FieldGenerators.