third_party/protobuf/src/google/protobuf/type.proto - 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/type.proto

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/type.proto

diff --git a/third_party/protobuf/src/google/protobuf/type.proto b/third_party/protobuf/src/google/protobuf/type.proto

index 1c9cf53da8a38f7423ea8bf6b2e043a6bbc7f9ea..504cd25db34967978843461479aefa158debd952 100644

--- a/third_party/protobuf/src/google/protobuf/type.proto

+++ b/third_party/protobuf/src/google/protobuf/type.proto

@@ -36,10 +36,10 @@ import "google/protobuf/any.proto";

import "google/protobuf/source_context.proto";

option csharp_namespace = "Google.Protobuf.WellKnownTypes";

+option cc_enable_arenas = true;

option java_package = "com.google.protobuf";

option java_outer_classname = "TypeProto";

option java_multiple_files = true;

-option java_generate_equals_and_hash = true;

option objc_class_prefix = "GPB";

// A protocol buffer message type.