aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/compiler/javanano/javanano_helpers.cc
diff options
context:
space:
mode:
authorUlas Kirazci <ulas@google.com>2013-10-09 17:51:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-09 17:51:07 +0000
commitc4a1b547c91178d79f5d2cc2e00b8be922c22fe8 (patch)
treebe35be61f98fbc0911b9d69ed9392a6318d8a95a /src/google/protobuf/compiler/javanano/javanano_helpers.cc
parent44cbb06c725fbba00464bba9f19dc0ea295406b1 (diff)
parent0b8579237336f221711a0aac42400eb31a58fed3 (diff)
downloadexternal_protobuf-c4a1b547c91178d79f5d2cc2e00b8be922c22fe8.zip
external_protobuf-c4a1b547c91178d79f5d2cc2e00b8be922c22fe8.tar.gz
external_protobuf-c4a1b547c91178d79f5d2cc2e00b8be922c22fe8.tar.bz2
Merge "Add reftypes field generator option."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_helpers.cc')
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_helpers.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_helpers.cc b/src/google/protobuf/compiler/javanano/javanano_helpers.cc
index c424165..ed6dbd7 100644
--- a/src/google/protobuf/compiler/javanano/javanano_helpers.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_helpers.cc
@@ -357,6 +357,10 @@ string DefaultValue(const Params& params, const FieldDescriptor* field) {
return EmptyArrayName(params, field);
}
+ if (params.use_reference_types_for_primitives()) {
+ return "null";
+ }
+
// Switch on cpp_type since we need to know which default_value_* method
// of FieldDescriptor to call.
switch (field->cpp_type()) {