diff options
| author |  Bo Yang <teboring@google.com> | 2016-09-22 18:04:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:44:21 -0700 |
| commit | e62d1f13f26306b0294dade74aed76b5836d6c8d (patch) | |
| tree | c685222f3a18da0760c7872839d21620c35c00b2 /src/google/protobuf/descriptor.proto | |
| parent | fac876dc7b51d6a64d45c7ddd13a72f00707902f (diff) | |
Add back removed descriptor field.
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 6 |
1 files changed, 2 insertions, 4 deletions
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 |