diff options
| author | Brian Duff <bduff@google.com> | 2014-10-01 12:55:00 -0700 |
|---|---|---|
| committer | Brian Duff <bduff@google.com> | 2014-10-01 12:55:00 -0700 |
| commit | 907e776a4015b6b55987f008429ba66babb920a1 (patch) | |
| tree | 3761669e811d2bcfa31b96f43e4b0a16c4d04d9c /src/google/protobuf/compiler/javanano/javanano_generator.cc | |
| parent | 7d1ca13f3781e8ccff0ecfab42250f1058c9152d (diff) | |
| download | external_protobuf-907e776a4015b6b55987f008429ba66babb920a1.zip external_protobuf-907e776a4015b6b55987f008429ba66babb920a1.tar.gz external_protobuf-907e776a4015b6b55987f008429ba66babb920a1.tar.bz2 | |
Change reftypes_primitive_enums to reftypes_compat_mode.
Make the clear() method stripped in reftypes_compat_mode.
Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_generator.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc index 1936e45..b1e75e3 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -140,9 +140,12 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, } else if (option_name == "optional_field_style") { params.set_optional_field_accessors(option_value == "accessors"); params.set_use_reference_types_for_primitives(option_value == "reftypes" - || option_value == "reftypes_primitive_enums"); + || option_value == "reftypes_compat_mode"); params.set_reftypes_primitive_enums( - option_value == "reftypes_primitive_enums"); + option_value == "reftypes_compat_mode"); + if (option_value == "reftypes_compat_mode") { + params.set_generate_clear(false); + } } else if (option_name == "generate_equals") { params.set_generate_equals(option_value == "true"); } else if (option_name == "ignore_services") { |