X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.ct;h=ab0de44ea45a80d859b34f0485efc207d3db5dc3;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=2cd02f8da7bea2152c8a0d396eafcf4f3d54a56a;hpb=c6cca4c701e40b4b5500fd1d4a7730e823d02076;p=senf.git

diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct
index 2cd02f8..ab0de44 100644
--- a/Packets/PacketRegistry.ct
+++ b/Packets/PacketRegistry.ct
@@ -33,6 +33,9 @@
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::PkReg_EntryImpl<PacketType>
+
 template <class PacketType>
 prefix_ senf::PacketInterpreterBase::factory_t senf::detail::PkReg_EntryImpl<PacketType>::factory()
     const
@@ -47,11 +50,25 @@ prefix_ std::string senf::detail::PkReg_EntryImpl<PacketType>::name()
     return prettyName(typeid(PacketType));
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::PacketRegistry<Tag>
+
+template <class Tag>
+prefix_ typename senf::PacketRegistry<Tag>::Registry &
+senf::PacketRegistry<Tag>::registry()
+{
+    static Registry registry (prettyName(typeid(Tag)));
+    return registry;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::PacketRegistryImpl<KeyType>:
+
 template <class KeyType>
 template <class PacketType>
 prefix_ void senf::detail::PacketRegistryImpl<KeyType>::registerPacket(key_t key)
 {
-#ifdef SENF_NO_DEBUG
+#ifndef SENF_DEBUG
     registry_.insert(std::make_pair(key, Entry_ptr(new detail::PkReg_EntryImpl<PacketType>())));
     reverseRegistry_.insert(std::make_pair(senf::typeIdValue<PacketType>(), key));
 #else
@@ -108,12 +125,13 @@ senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key, bool)
     return i->second.get();
 }
 
-template <class Tag>
-prefix_ typename senf::PacketRegistry<Tag>::Registry &
-senf::PacketRegistry<Tag>::registry()
+template <class KeyType>
+prefix_ void senf::detail::PacketRegistryImpl<KeyType>::v_dump(std::ostream & os)
 {
-    static Registry registry;
-    return registry;
+    typename PacketMap::const_iterator i (registry_.begin());
+    typename PacketMap::const_iterator const i_end (registry_.end());
+    for (; i != i_end; ++i)
+        os << i->first << " " << i->second->name() << "\n";
 }
 
 ///////////////////////////////ct.e////////////////////////////////////////