diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-11 20:36:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-11 20:36:01 +0000 |
| commit | 39cee9f1f5cd513a53ac5100eb208ed431f99af0 (patch) | |
| tree | 688c10f285f9594d56d791d1757fc81f6c4d70ec /src/google/protobuf/compiler/javanano/javanano_message_field.cc | |
| parent | cbb08132821cb56f4e6c5e5f8a0b32f51879782a (diff) | |
| parent | 5ae438cf71487d5bc8cb5c0d0e637f976734d110 (diff) | |
| download | external_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.zip external_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.tar.gz external_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.tar.bz2 | |
Merge "Remove all field initializers and let ctor call clear()."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message_field.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc index 02dbdb1..277eb4e 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc @@ -84,7 +84,7 @@ MessageFieldGenerator::~MessageFieldGenerator() {} void MessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "public $type$ $name$ = null;\n"); + "public $type$ $name$;\n"); } void MessageFieldGenerator:: @@ -144,7 +144,7 @@ AccessorMessageFieldGenerator::~AccessorMessageFieldGenerator() {} void AccessorMessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "private $type$ $name$_ = null;\n" + "private $type$ $name$_;\n" "public $type$ get$capitalized_name$() {\n" " return $name$_;\n" "}\n" @@ -218,7 +218,7 @@ RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {} void RepeatedMessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "public $type$[] $name$ = $type$.EMPTY_ARRAY;\n"); + "public $type$[] $name$;\n"); } void RepeatedMessageFieldGenerator:: @@ -231,7 +231,8 @@ void RepeatedMessageFieldGenerator:: GenerateMergingCode(io::Printer* printer) const { // First, figure out the length of the array, then parse. printer->Print(variables_, - "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n" + "int arrayLength = com.google.protobuf.nano.WireFormatNano" + " .getRepeatedFieldArrayLength(input, $tag$);\n" "int i = this.$name$.length;\n" "$type$[] newArray = new $type$[i + arrayLength];\n" "System.arraycopy(this.$name$, 0, newArray, 0, i);\n" |