From 19641419a381509bddfc2d0b5d60a411b67b105b Mon Sep 17 00:00:00 2001
From: Brian Duff <bduff@google.com>
Date: Fri, 28 Jun 2013 17:23:51 -0700
Subject: Make it possible to use MessageNano.mergeFrom without casting.

You can now do:

  MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes);

without having to cast the message returned from mergeFrom.

Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
---
 src/google/protobuf/compiler/javanano/javanano_message.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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"
-- 
cgit v1.1