aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.proto
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-07-13 13:47:51 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-07-13 13:48:40 -0700
commit9086d9643903c608ab015b0b7d903547a4e7b6f3 (patch)
treeb47053ab6f6bde20b55c4fff4019c68a7c45545c /src/google/protobuf/descriptor.proto
parent70c1ac756d3cd8fa04725f82f0ad1a30404c3bb3 (diff)
downloadprotobuf-9086d9643903c608ab015b0b7d903547a4e7b6f3.tar.gz
protobuf-9086d9643903c608ab015b0b7d903547a4e7b6f3.tar.bz2
protobuf-9086d9643903c608ab015b0b7d903547a4e7b6f3.zip
Integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r--src/google/protobuf/descriptor.proto1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index da853dbc..28410d4a 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -45,6 +45,7 @@ option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
option csharp_namespace = "Google.Protobuf.Reflection";
option objc_class_prefix = "GPB";
+option java_generate_equals_and_hash = true;
// descriptor.proto must be optimized for speed because reflection-based
// algorithms don't work during bootstrapping.