aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/compiler/javanano/javanano_generator.cc
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2014-10-01 15:02:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-10-01 15:02:26 +0000
commit7d1ca13f3781e8ccff0ecfab42250f1058c9152d (patch)
treec33c1adbeb7cdfa084e6355a04fcbae181b3dffc /src/google/protobuf/compiler/javanano/javanano_generator.cc
parentd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc (diff)
parent339478eea8a7889d1c086d216f72fa63c1b5307d (diff)
downloadexternal_protobuf-7d1ca13f3781e8ccff0ecfab42250f1058c9152d.zip
external_protobuf-7d1ca13f3781e8ccff0ecfab42250f1058c9152d.tar.gz
external_protobuf-7d1ca13f3781e8ccff0ecfab42250f1058c9152d.tar.bz2
Merge "Adds a primitive enum mode for reftypes."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_generator.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc
index 61ef2ca..1936e45 100644
--- a/src/google/protobuf/compiler/javanano/javanano_generator.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc
@@ -139,7 +139,10 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file,
params.set_java_enum_style(option_value == "java");
} 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");
+ params.set_use_reference_types_for_primitives(option_value == "reftypes"
+ || option_value == "reftypes_primitive_enums");
+ params.set_reftypes_primitive_enums(
+ option_value == "reftypes_primitive_enums");
} else if (option_name == "generate_equals") {
params.set_generate_equals(option_value == "true");
} else if (option_name == "ignore_services") {