third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_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/cpp/cpp_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:

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 b3ba3a2e5ad340c6bc09194be695b0a0889ace5d..e2033c1acdc0271b627373745a3a8139fdc25b50 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

@@ -78,7 +78,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor,

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

? " PROTOBUF_DEPRECATED" : "";

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

- ? "PROTOBUF_DEPRECATED_ATTR " : "";

+ ? "GOOGLE_PROTOBUF_DEPRECATED_ATTR " : "";

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