diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-09 17:23:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-09 17:23:52 +0000 |
| commit | 8cf17a8fbab128bda57c573e2ef7e0fafea39269 (patch) | |
| tree | 289e18f33fb401766b41747fb27d8de85fb86bf5 /src | |
| parent | eda87c5cad8cf84768bcb31d4762c6ec35a6b87d (diff) | |
| parent | 19641419a381509bddfc2d0b5d60a411b67b105b (diff) | |
| download | external_protobuf-8cf17a8fbab128bda57c573e2ef7e0fafea39269.zip external_protobuf-8cf17a8fbab128bda57c573e2ef7e0fafea39269.tar.gz external_protobuf-8cf17a8fbab128bda57c573e2ef7e0fafea39269.tar.bz2 | |
Merge "Make it possible to use MessageNano.mergeFrom without casting."
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc index 2740779..11fb452 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message.cc @@ -362,7 +362,7 @@ GenerateParseFromMethods(io::Printer* printer) { printer->Print( "public $static$ $classname$ parseFrom(byte[] data)\n" " throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {\n" - " return ($classname$) com.google.protobuf.nano.MessageNano.mergeFrom(new $classname$(), data);\n" + " return com.google.protobuf.nano.MessageNano.mergeFrom(new $classname$(), data);\n" "}\n" "\n" "public $static$ $classname$ parseFrom(\n" |