X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;h=63cc6f16c1dac82b14baebad1b4556f245c1b147;hb=cc2e643d6ec3025db3fb6f0a4c1f77af05cf1026;hp=ce200a2c0ea49afed1f320b0914c252a094669bd;hpb=1565dec0f4a86e4bda7095dd7415234f7c7a84e9;p=libs%2Fnet.git

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index ce200a2..63cc6f1 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -1,9 +1,9 @@
+#include "protocol.h"
 #include <cstring>
 #include <string>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "protocol.h"
 
 using namespace std;
 
@@ -18,29 +18,20 @@ Protocol::Protocol(unsigned npi):
 		.fields(&PacketHeader::type, &PacketHeader::length);
 }
 
-Protocol::~Protocol()
-{
-	for(auto &kvp: packet_class_defs)
-		delete kvp.second;
-}
-
 unsigned Protocol::get_next_packet_class_id()
 {
 	static unsigned next_id = 1;
 	return next_id++;
 }
 
-void Protocol::add_packet(PacketDefBase *pdef)
+void Protocol::add_packet(unique_ptr<PacketDefBase> pdef)
 {
-	PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
+	unique_ptr<PacketDefBase> &ptr = packet_class_defs[pdef->get_class_id()];
 	if(ptr)
-	{
 		packet_id_defs.erase(ptr->get_id());
-		delete ptr;
-	}
-	ptr = pdef;
-	if(unsigned id = pdef->get_id())
-		packet_id_defs[id] = pdef;
+	ptr = move(pdef);
+	if(unsigned id = ptr->get_id())
+		packet_id_defs[id] = ptr.get();
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class_id(unsigned id) const