X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacket.mpp;h=e743d5a3cde6b2039533541782cd2dc94bb16b71;hb=9a988902090d28007578e93bffd809f6bd913155;hp=3d47d96bfba4fc100bf1f89cbd040b164e8fdfc5;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git diff --git a/Packets/Packet.mpp b/Packets/Packet.mpp index 3d47d96..e743d5a 100644 --- a/Packets/Packet.mpp +++ b/Packets/Packet.mpp @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2006 +// Copyright (C) 2006 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) // Kompetenzzentrum fuer Satelitenkommunikation (SatCom) // Stefan Bund @@ -49,14 +49,14 @@ typename ptr_t::ptr reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION( // Packet::reinterpret implementation template -prefix_ typename satcom::pkf::Packet::ptr_t::ptr -satcom::pkf::Packet::reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) ) +prefix_ typename senf::Packet::ptr_t::ptr +senf::Packet::reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) ) { if (!OtherPacket::check(begin(),end())) throw TruncatedPacketException(); typename ptr_t::ptr p ( new OtherPacket(PacketOp_replace(this), - BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a ) ), + BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a ) ), false); return p; } @@ -75,8 +75,8 @@ typename ptr_t::ptr registerInterpreter( // Packet::registerIterpreter implementation template -prefix_ typename satcom::pkf::Packet::ptr_t::ptr -satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin, +prefix_ typename senf::Packet::ptr_t::ptr +senf::Packet::registerInterpreter(raw_container::iterator begin, raw_container::iterator end, BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) ) const @@ -84,10 +84,10 @@ satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin, if (!OtherPacket::check(begin,end)) throw TruncatedPacketException(); typename ptr_t::ptr p ( - new OtherPacket(PacketOp_register(begin-impl_->data_.begin(), - end-impl_->data_.begin(), - this), - BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a) ), + new OtherPacket(PacketOp_register(begin-impl_->data_.begin(), + end-impl_->data_.begin(), + this), + BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a) ), false); return p; } @@ -96,9 +96,9 @@ satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin, /////////////////////////////////////////////////////////////////////////// // Packet::create declaration -template < class OtherPacket, class InputIterator, +template < class OtherPacket, class InputIterator, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) > -static typename satcom::pkf::Packet::ptr_t::ptr create( +static typename senf::Packet::ptr_t::ptr create( InputIterator b, InputIterator e, BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) ); @@ -106,9 +106,9 @@ static typename satcom::pkf::Packet::ptr_t::ptr create( /////////////////////////////////////////////////////////////////////////// // Packet::create implementation -template < class OtherPacket, class InputIterator, +template < class OtherPacket, class InputIterator, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) > -typename satcom::pkf::Packet::ptr_t::ptr satcom::pkf::Packet::create( +typename senf::Packet::ptr_t::ptr senf::Packet::create( InputIterator b, InputIterator e, BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) ) { @@ -116,8 +116,8 @@ typename satcom::pkf::Packet::ptr_t::ptr satcom::pkf::Packet::creat if (!OtherPacket::check(impl->data_.begin(), impl->data_.end())) throw TruncatedPacketException(); typename ptr_t::ptr p ( - new OtherPacket(PacketOp_set(impl.get()), - BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a) ), + new OtherPacket(PacketOp_set(impl.get()), + BOOST_PP_ENUM_PARAMS( BOOST_PP_ITERATION(), a) ), false); return p; } @@ -130,5 +130,8 @@ typename satcom::pkf::Packet::ptr_t::ptr satcom::pkf::Packet::creat // Local Variables: // mode: c++ -// c-file-style: "satcom" +// fill-column: 100 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" // End: