X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketParser.cti;h=7872f83d5e0991625b6be791d8a9c76fcf532f17;hb=748363b235c4651b3992cc291a95dc2e18e45724;hp=03a41b490bbc8c561fe2934a2f96ee172b4efba0;hpb=6116cb96ea7bdcb42b7d12165a05fcbe0687226d;p=senf.git

diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti
index 03a41b4..7872f83 100644
--- a/Packets/PacketParser.cti
+++ b/Packets/PacketParser.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -26,6 +26,7 @@
 #include "PacketParser.ih"
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 #include "PacketData.hh"
 
 #define prefix_ inline
@@ -105,20 +106,20 @@ prefix_ senf::PacketParserBase::size_type senf::detail::packetParserSize(Parser
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::SafePacketParser<Parser>
+// senf::SafePacketParserWrapper<Parser>
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser()
+prefix_ senf::SafePacketParserWrapper<Parser>::SafePacketParserWrapper()
     : parser_(), i_()
 {}
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser(Parser parser)
+prefix_ senf::SafePacketParserWrapper<Parser>::SafePacketParserWrapper(Parser parser)
     : parser_(parser), i_(parser)
 {}
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser> & senf::SafePacketParser<Parser>::operator=(Parser parser)
+prefix_ senf::SafePacketParserWrapper<Parser> & senf::SafePacketParserWrapper<Parser>::operator=(Parser parser)
 {
     parser_ = parser;
     i_ = parser;
@@ -126,25 +127,25 @@ prefix_ senf::SafePacketParser<Parser> & senf::SafePacketParser<Parser>::operato
 }
 
 template <class Parser>
-prefix_ Parser senf::SafePacketParser<Parser>::operator*()
+prefix_ Parser senf::SafePacketParserWrapper<Parser>::operator*()
     const
 {
-    BOOST_ASSERT( i_ );
+    SENF_ASSERT( i_ );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return *parser_;
 }
 
 template <class Parser>
-prefix_ Parser const * senf::SafePacketParser<Parser>::operator->()
+prefix_ Parser const * senf::SafePacketParserWrapper<Parser>::operator->()
     const
 {
-    BOOST_ASSERT( i_ );
+    SENF_ASSERT( i_ );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return & (*parser_);
 }
 
 template <class Parser>
-prefix_ bool senf::SafePacketParser<Parser>::boolean_test()
+prefix_ bool senf::SafePacketParserWrapper<Parser>::boolean_test()
     const
 {
     return i_;