From 7ad981638ea568caf0e3495752cb1bc4a3a853dd Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Wed, 29 Jun 2016 17:44:02 +0300
Subject: [PATCH] update msgpack to 2.0.0 and fix

---
 src/network/networkpacket.cpp | 6 +++---
 src/network/networkpacket.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
index e588f3426..e8c075df9 100644
--- a/src/network/networkpacket.cpp
+++ b/src/network/networkpacket.cpp
@@ -539,11 +539,11 @@ Buffer<u8> NetworkPacket::oldForgePacket()
 }
 
 //freeminer:
-bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked *msg) {
+bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg) {
 	try {
 		//msgpack::unpacked msg;
 		msgpack::unpack(msg, data, datasize);
-		msgpack::object obj = msg->get();
+		msgpack::object obj = msg.get();
 		*packet = obj.as<MsgpackPacket>();
 
 		*command = (*packet)[MSGPACK_COMMAND].as<int>();
@@ -576,7 +576,7 @@ int NetworkPacket::packet_unpack() {
 		packet = new MsgpackPacketSafe;
 	if (!packet_unpacked)
 		packet_unpacked = new msgpack::unpacked;
-	if (!parse_msgpack_packet(getString(0), datasize, packet, &command, packet_unpacked)) {
+	if (!parse_msgpack_packet(getString(0), datasize, packet, &command, *packet_unpacked)) {
 		//verbosestream<<"Server: Ignoring broken packet from " <<addr_s<<" (peer_id="<<peer_id<<") size="<<datasize<<std::endl;
 		return 0;
 	}
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index 106ee74b1..70eab7102 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -140,6 +140,6 @@ class NetworkPacket
 };
 
 #include "../util/msgpack_serialize.h"
-bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked *msg);
+bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg);
 
 #endif