X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.ct;h=2f598ced50287ede180ccc0cb38b7f6bcae2f0ef;hb=0734bd14c709ca5ba1d0ed69c5b9f5d1487e5faa;hp=4d68a92621f24997d1fe600b4986367466f17845;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct index 4d68a92..2f598ce 100644 --- a/Packets/PacketRegistry.ct +++ b/Packets/PacketRegistry.ct @@ -1,8 +1,8 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -26,6 +26,7 @@ #include "PacketRegistry.ih" // Custom includes +#include "../Utils/senfassert.hh" #include #define prefix_ @@ -42,7 +43,7 @@ template template prefix_ void senf::detail::PacketRegistryImpl::registerPacket(key_t key) { -#ifdef NDEBUG +#ifdef SENF_NO_DEBUG registry_.insert(std::make_pair(key, Entry_ptr(new detail::PkReg_EntryImpl()))); reverseRegistry_.insert(std::make_pair(senf::typeIdValue(), key)); #else @@ -50,12 +51,12 @@ prefix_ void senf::detail::PacketRegistryImpl::registerPacket(key_t key registry_.insert( std::make_pair(key, Entry_ptr(new detail::PkReg_EntryImpl()))).second); // If this assertion fails, a Packet was registered with an already known key - BOOST_ASSERT( isUnique ); + SENF_ASSERT( isUnique ); bool isNew ( reverseRegistry_.insert( std::make_pair(senf::typeIdValue(), key)).second); // If this assertion fails, the same Packet was registered with two different keys - BOOST_ASSERT( isNew ); + SENF_ASSERT( isNew ); #endif }