From e62d1f13f26306b0294dade74aed76b5836d6c8d Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Thu, 22 Sep 2016 18:04:02 -0700 Subject: Add back removed descriptor field. --- src/google/protobuf/descriptor.proto | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/google/protobuf/descriptor.proto') diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 23a9fe92..558ae23e 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -305,10 +305,8 @@ message FileOptions { // top-level extensions defined in the file. optional bool java_multiple_files = 10 [default=false]; - // BEGIN PROTOBUF-OPENSOURCE - // // This option does nothing. - // optional bool java_generate_equals_and_hash = 20 [deprecated=true]; - // END PROTOBUF-OPENSOURCE + // This option does nothing. + optional bool java_generate_equals_and_hash = 20 [deprecated=true]; // If set true, then the Java2 code generator will generate code that // throws an exception whenever an attempt is made to assign a non-UTF-8 -- cgit v1.2.3