Move the definition of PacketTypeDef<T>::class_id to a separate header

[libs/net.git] / source / net / protocol.cpp

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 4d3f9628f9d1eddbc4a9bc81f9547bba6dbf153b..52678af2d9009cf9279d88ce3e1856d0fee1be9b 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -5,6 +5,7 @@
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include "protocol.h"
+#include "protocol_impl.h"
 
 using namespace std;
 
@@ -29,9 +30,13 @@ void Protocol::add_packet(PacketDefBase *pdef)
 {
        PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
        if(ptr)
+       {
+               packet_id_defs.erase(ptr->get_id());
                delete ptr;
+       }
        ptr = pdef;
-       packet_id_defs[pdef->get_id()] = pdef;
+       if(unsigned id = pdef->get_id())
+               packet_id_defs[id] = pdef;
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class_id(unsigned id) const