X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketInterpreter.ct;h=49a34e1649e714c45247a0773654488b437308df;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=ee4ff1f5afcc0f8807592bdadfe0c553947e6ace;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/Packets/PacketInterpreter.ct b/Packets/PacketInterpreter.ct index ee4ff1f..49a34e1 100644 --- a/Packets/PacketInterpreter.ct +++ b/Packets/PacketInterpreter.ct @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -63,14 +63,14 @@ senf::PacketInterpreter::create(size_type size) { if (size < initSize()) throw TruncatedPacketException(); - ptr pi (create(size,noinit)); + ptr pi (create(size,senf::noinit)); pi->init(); return pi; } template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::create(size_type size, NoInit_t) +senf::PacketInterpreter::create(size_type size, senf::NoInit_t) { detail::PacketImpl::Guard p (new detail::PacketImpl(size,0)); ptr pi (create(p.p,p.p->begin(),p.p->end(),Append)); @@ -86,7 +86,7 @@ senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr pack { if (size < initSize()) throw TruncatedPacketException(); - ptr pi (createAfter(packet,size,noinit)); + ptr pi (createAfter(packet,size,senf::noinit)); std::fill(pi->data().begin(), pi->data().end(),0); pi->init(); return pi; @@ -95,7 +95,7 @@ senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr pack template prefix_ typename senf::PacketInterpreter::ptr senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr packet, - size_type size, NoInit_t) + size_type size, senf::NoInit_t) { optional_range r (packet->nextPacketRange()); if (!r) @@ -134,7 +134,7 @@ template prefix_ typename senf::PacketInterpreter::ptr senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr packet) { - ptr pi (createBefore(packet, noinit)); + ptr pi (createBefore(packet, senf::noinit)); pi->data().insert(pi->data().begin(),initHeadSize(),byte(0x00u)); pi->data().insert(pi->data().end(),initSize()-initHeadSize(),byte(0x00u)); pi->init(); @@ -143,7 +143,7 @@ senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr pac template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr packet, NoInit_t) +senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t) { if (packet->prev()) packet->impl().truncateInterpretersBackwards(packet->prev().get()); @@ -222,7 +222,7 @@ prefix_ senf::PacketInterpreterBase::ptr senf::PacketInterpreterBase::Factory::create(ForwardReadableRange const & range) const { - ptr pi (create(boost::size(range),noinit)); + ptr pi (create(boost::size(range),senf::noinit)); std::copy(boost::begin(range), boost::end(range), pi->data().begin()); return pi; } @@ -233,7 +233,7 @@ senf::PacketInterpreterBase::Factory::createAfter(PacketInterpreterBase::ptr pac ForwardReadableRange const & range) const { - ptr pi (createAfter(packet,boost::size(range),noinit)); + ptr pi (createAfter(packet,boost::size(range),senf::noinit)); std::copy(boost::begin(range), boost::end(range), pi->data().begin()); return pi; } @@ -253,10 +253,10 @@ senf::PacketInterpreter::FactoryImpl::create() template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::create(NoInit_t) +senf::PacketInterpreter::FactoryImpl::create(senf::NoInit_t) const { - return senf::PacketInterpreter::create(noinit); + return senf::PacketInterpreter::create(senf::noinit); } template @@ -269,10 +269,10 @@ senf::PacketInterpreter::FactoryImpl::create(size_type size) template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::create(size_type size, NoInit_t) +senf::PacketInterpreter::FactoryImpl::create(size_type size, senf::NoInit_t) const { - return senf::PacketInterpreter::create(size, noinit); + return senf::PacketInterpreter::create(size, senf::noinit); } // Create packet as new packet after a given packet @@ -288,10 +288,10 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet, - NoInit_t) + senf::NoInit_t) const { - return senf::PacketInterpreter::createAfter(packet,noinit); + return senf::PacketInterpreter::createAfter(packet,senf::noinit); } template @@ -306,10 +306,10 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet, - size_type size, NoInit_t) + size_type size, senf::NoInit_t) const { - return senf::PacketInterpreter::createAfter(packet,size,noinit); + return senf::PacketInterpreter::createAfter(packet,size,senf::noinit); } // Create packet as new packet (header) before a given packet @@ -326,10 +326,10 @@ createBefore(PacketInterpreterBase::ptr packet) template prefix_ senf::PacketInterpreterBase::ptr senf::PacketInterpreter::FactoryImpl:: -createBefore(PacketInterpreterBase::ptr packet, NoInit_t) +createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t) const { - return senf::PacketInterpreter::createBefore(packet,noinit); + return senf::PacketInterpreter::createBefore(packet,senf::noinit); } // Parse next packet in chain