diff options
author | Bo Yang <teboring@google.com> | 2016-09-19 13:45:07 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2016-10-10 11:23:36 -0700 |
commit | cc8ca5b6a5478b40546d4206392eb1471454460d (patch) | |
tree | c0b45abfa16d7d373a6ea8f7fe50f1de00ab938e /src/google/protobuf/type.proto | |
parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) |
Integrate internal changes
Diffstat (limited to 'src/google/protobuf/type.proto')
-rw-r--r-- | src/google/protobuf/type.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/type.proto b/src/google/protobuf/type.proto index 1c9cf53d..504cd25d 100644 --- a/src/google/protobuf/type.proto +++ b/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. |