aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/javanano/javanano_generator.cc
diff options
context:
space:
mode:
authorGravatar Brian Duff <bduff@google.com>2014-10-01 12:55:00 -0700
committerGravatar Brian Duff <bduff@google.com>2014-10-01 12:55:00 -0700
commit7fbf654004576cc50f7aceca076450e3f8aa4a6f (patch)
treee4719c4ae4db3c8031886890a47e5176ea9e88a7 /src/google/protobuf/compiler/javanano/javanano_generator.cc
parent517591b8ea2789cf0fc2ec00fa1b90e330da4e60 (diff)
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.cc7
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 1936e452..b1e75e3d 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") {