X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketRegistry.ct;h=6c594b9bcdc481b19cc391d9ae4705cc2f8e452f;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=40afa89b9310758f27ba67a9b1a3dba7c1bae6fc;hpb=4d90b955bf3590e215488395d1c9cec827476e07;p=senf.git

diff --git a/senf/Packets/PacketRegistry.ct b/senf/Packets/PacketRegistry.ct
index 40afa89..6c594b9 100644
--- a/senf/Packets/PacketRegistry.ct
+++ b/senf/Packets/PacketRegistry.ct
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief PacketRegistry non-inline template implementation */
@@ -26,17 +31,16 @@
 #include "PacketRegistry.ih"
 
 // Custom includes
-#include <senf/Utils/senfassert.hh>
 #include <iostream>
 #include <iomanip>
-#include <cmath>
 #include <senf/Utils/TypeInfo.hh>
 #include <senf/Utils/Format.hh>
+#include <senf/Utils/senfassert.hh>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::PacketRegistryImpl<KeyType>::Entry
 
 template <class KeyType>
@@ -49,7 +53,7 @@ template <class KeyType>
 prefix_ senf::detail::PacketRegistryImpl<KeyType>::Entry::~Entry()
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::PacketRegistryImpl<KeyType>::EntryImpl<PacketType>
 
 template <class KeyType>
@@ -85,26 +89,17 @@ senf::detail::PacketRegistryImpl<KeyType>::EntryImpl<PacketType>::type()
     return 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, int priority)
 {
-    SENF_ASSERT(registry_.insert(
-                    typename Entry::ptr(new EntryImpl<PacketType>(key,priority))).second);
+    SENF_ASSERT_EXPRESSION(
+        registry_.insert(
+            typename Entry::ptr(new EntryImpl<PacketType>(key,priority))).second,
+        "Duplicate packet registration");
 }
 
 template <class KeyType>
@@ -195,7 +190,7 @@ prefix_ void senf::detail::PacketRegistryImpl<KeyType>::v_clear()
     registry_.clear();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::DumpKey<KeyType,is_integral>
 
 template <class KeyType, bool is_integral>
@@ -213,7 +208,7 @@ prefix_ void senf::detail::DumpKey<KeyType, true>::dump(KeyType const & v, std::
     os << "  " << senf::format::dumpint(v);
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_