From cb50941cbee139b8f374b529062b6cc37250dc6e Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Thu, 22 Sep 2016 18:04:02 -0700 Subject: [PATCH] Add back removed descriptor field. --- google/protobuf/descriptor.proto | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto index 23a9fe9285d72..558ae23eb48de 100644 --- a/google/protobuf/descriptor.proto +++ b/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