summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2015-03-20 18:58:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-20 18:58:23 +0000
commit51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93 (patch)
tree698e617f7ef835e6c8692ee09276509a07f80fb1
parent182e6d054c06f3a8e44cf9a09e14870366fa1190 (diff)
parentc8518963254eb51bd8ec52750c2cc487fa857c72 (diff)
downloadexternal_protobuf-51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93.zip
external_protobuf-51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93.tar.gz
external_protobuf-51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93.tar.bz2
Merge "Expose generate_clear as an option."
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_generator.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc
index 96e3e80..99ebe12 100644
--- a/src/google/protobuf/compiler/javanano/javanano_generator.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc
@@ -156,6 +156,8 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file,
params.set_generate_clone(option_value == "true");
} else if (option_name == "generate_intdefs") {
params.set_generate_intdefs(option_value == "true");
+ } else if (option_name == "generate_clear") {
+ params.set_generate_clear(option_value == "true");
} else {
*error = "Ignore unknown javanano generator option: " + option_name;
}