X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketRegistry.ct;h=81e9983d6f1c9d9a5dfcb2f2a76aa2d0ed4ba18f;hb=refs%2Fheads%2Fmaster;hp=8c746f94c843dd4c47c92ebce9615f6e79ec5896;hpb=3aced0177a1c69c7af338b4e66db8694a71873ae;p=senf.git

diff --git a/senf/Packets/PacketRegistry.ct b/senf/Packets/PacketRegistry.ct
index 8c746f9..81e9983 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 */
@@ -101,7 +106,7 @@ template <class KeyType>
 template <class PacketType>
 prefix_ void senf::detail::PacketRegistryImpl<KeyType>::unregisterPacket()
 {
-    registry_.template get<ByType>().erase(typeid(PacketType));
+    registryByType_.erase(typeid(PacketType));
 }
 
 template <class KeyType>
@@ -128,10 +133,8 @@ template <class KeyType>
 prefix_ boost::optional<typename senf::detail::PacketRegistryImpl<KeyType>::key_t>
 senf::detail::PacketRegistryImpl<KeyType>::key(senf::TypeIdValue const & type, bool)
 {
-    typedef typename Registry::template index<ByType>::type TypeIndex;
-    TypeIndex const & typeIndex (registry_.template get<ByType>());
-    typename TypeIndex::const_iterator i (typeIndex.find(type.id()));
-    if (i == typeIndex.end())
+    typename RegistryByType::const_iterator i (registryByType_.find(type.id()));
+    if (i == registryByType_.end())
         return boost::optional<key_t>();
     return (*i)->key;
 }
@@ -139,6 +142,7 @@ senf::detail::PacketRegistryImpl<KeyType>::key(senf::TypeIdValue const & type, b
 template <class KeyType>
 prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::Entry const &
 senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key)
+    const
 {
     Entry const * e (lookup(key, true));
     if (!e)
@@ -149,11 +153,10 @@ senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key)
 template <class KeyType>
 prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::Entry const *
 senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key, bool)
+    const
 {
-    typedef typename Registry::template index<ByKey>::type KeyIndex;
-    KeyIndex const & keyIndex (registry_.template get<ByKey>());
-    typename KeyIndex::const_iterator i (keyIndex.lower_bound(key));
-    if (i == keyIndex.end() || (*i)->key != key)
+    typename RegistryByKey::const_iterator i (registryByKey_.lower_bound(key));
+    if (i == registryByKey_.end() || (*i)->key != key)
         return 0;
     return i->get();
 }
@@ -169,10 +172,7 @@ template <class KeyType>
 prefix_ void senf::detail::PacketRegistryImpl<KeyType>::v_dump(std::ostream & os)
     const
 {
-    typedef typename Registry::template index<ByKey>::type KeyIndex;
-    KeyIndex const & keyIndex (registry_.template get<ByKey>());
-    for (typename KeyIndex::iterator i (keyIndex.begin()), i_end (keyIndex.end());
-         i != i_end; ++i) {
+    for (typename RegistryByKey::const_iterator i (registryByKey_.begin()), i_end (registryByKey_.end()); i != i_end; ++i) {
         std::string n ((*i)->name());
         senf::detail::DumpKey<KeyType>::dump((*i)->key, os);
         os << ' ' << std::setw(6) << (*i)->priority << ' ' << n.substr(21,n.size()-22) << '\n';