minor fixes for clang++

[senf.git] / senf / Packets / PacketRegistry.ih

diff --git a/senf/Packets/PacketRegistry.ih b/senf/Packets/PacketRegistry.ih
index 382ff30..322153a 100644 (file)
--- a/senf/Packets/PacketRegistry.ih
+++ b/senf/Packets/PacketRegistry.ih
@@ -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 internal header */
@@ -27,7 +32,6 @@
 #define IH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
-#include <ext/functional>
 #include <limits>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -35,7 +39,7 @@
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/mem_fun.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <boost/utility.hpp> // for boost::noncopyable
 #include <senf/Utils/TypeIdValue.hh>
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -116,11 +120,13 @@ namespace detail {
                         std::greater<int> > >,
                 boost::multi_index::ordered_unique<
                     boost::multi_index::tag<ByType>,
-                    boost::multi_index::mem_fun<Entry const,std::type_info const &,&Entry::type>,
+                    boost::multi_index::const_mem_fun<Entry,std::type_info const &,&Entry::type>,
                     TypeInfoCompare> >
         {};
 
         typedef boost::multi_index_container<typename Entry::ptr, RegistryIndices> Registry;
+        typedef typename Registry::template index<ByKey>::type RegistryByKey;
+        typedef typename Registry::template index<ByType>::type RegistryByType;
 
         template <class PacketType>
         struct EntryImpl : public Entry
@@ -157,8 +163,8 @@ namespace detail {
         key_t key(senf::TypeIdValue const & type);
         boost::optional<key_t> key(senf::TypeIdValue const & type, bool);
 
-        Entry const & lookup(key_t key);
-        Entry const * lookup(key_t key, bool);
+        Entry const & lookup(key_t key) const;
+        Entry const * lookup(key_t key, bool) const;
 
         iterator begin() const;
         iterator end() const;
@@ -171,6 +177,8 @@ namespace detail {
         virtual void v_clear();
 
         Registry registry_;
+        RegistryByKey & registryByKey_;
+        RegistryByType & registryByType_;
     };
 
     template <class KeyType, bool is_integral=std::numeric_limits<KeyType>::is_integer>