Packet: optimized Packet.is<> member by removing dynamic_cast

[senf.git] / senf / Packets / Packet.cti

diff --git a/senf/Packets/Packet.cti b/senf/Packets/Packet.cti
index 8184317..80bb93a 100644 (file)
--- a/senf/Packets/Packet.cti
+++ b/senf/Packets/Packet.cti
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 Packet inline template implementation */
@@ -54,7 +59,10 @@ template <class OtherPacket>
 prefix_ bool senf::Packet::is()
     const
 {
-    return valid() && ptr()->is<typename OtherPacket::type>();
+    // ensure that the template class is included in the corresponding object file when linking:
+    { static typename PacketInterpreter<typename OtherPacket::type>::factory_t _ (
+            PacketInterpreter<typename OtherPacket::type>::factory()); (void) _;}
+    return valid() && typeId() == typeIdValue<OtherPacket>();
 }
 
 template <class OtherPacket>
@@ -322,6 +330,16 @@ senf::ConcretePacket<PacketType>::operator->()
     return ParserProxy(parser());
 }
 
+template <class PacketType>
+prefix_ senf::Packet senf::ConcretePacket<PacketType>::next(NoThrow_t)
+    const
+{
+    PacketInterpreterBase::ptr p (Packet::ptr()->next());
+    if (p) return Packet(p);
+    PacketInterpreterBase::optional_range r (type::nextPacketRange(*this));
+    return (r && ! r->empty()) ? getNext(r) : Packet();
+}
+
 // private members
 
 template <class PacketType>