X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketInterpreter.ct;h=49a34e1649e714c45247a0773654488b437308df;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=b2f455b2b752414a4b01b2260ba792f1ac94ac44;hpb=f13c1275e48e97dceb7de7925793a4c69a5aeb61;p=senf.git

diff --git a/Packets/PacketInterpreter.ct b/Packets/PacketInterpreter.ct
index b2f455b..49a34e1 100644
--- a/Packets/PacketInterpreter.ct
+++ b/Packets/PacketInterpreter.ct
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// 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
@@ -61,14 +63,14 @@ senf::PacketInterpreter<PacketType>::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 <class PacketType>
 prefix_ typename senf::PacketInterpreter<PacketType>::ptr
-senf::PacketInterpreter<PacketType>::create(size_type size, NoInit_t)
+senf::PacketInterpreter<PacketType>::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));
@@ -84,7 +86,7 @@ senf::PacketInterpreter<PacketType>::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;
@@ -93,7 +95,7 @@ senf::PacketInterpreter<PacketType>::createAfter(PacketInterpreterBase::ptr pack
 template <class PacketType>
 prefix_ typename senf::PacketInterpreter<PacketType>::ptr
 senf::PacketInterpreter<PacketType>::createAfter(PacketInterpreterBase::ptr packet,
-                                                 size_type size, NoInit_t)
+                                                 size_type size, senf::NoInit_t)
 {
     optional_range r (packet->nextPacketRange());
     if (!r)
@@ -132,7 +134,7 @@ template <class PacketType>
 prefix_ typename senf::PacketInterpreter<PacketType>::ptr
 senf::PacketInterpreter<PacketType>::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();
@@ -141,7 +143,7 @@ senf::PacketInterpreter<PacketType>::createBefore(PacketInterpreterBase::ptr pac
 
 template <class PacketType>
 prefix_ typename senf::PacketInterpreter<PacketType>::ptr
-senf::PacketInterpreter<PacketType>::createBefore(PacketInterpreterBase::ptr packet, NoInit_t)
+senf::PacketInterpreter<PacketType>::createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t)
 {
     if (packet->prev())
         packet->impl().truncateInterpretersBackwards(packet->prev().get());
@@ -194,7 +196,7 @@ prefix_ void senf::PacketInterpreter<PacketType>::v_dump(std::ostream & os)
 template <class PacketType>
 prefix_ senf::TypeIdValue senf::PacketInterpreter<PacketType>::v_type()
 {
-    return typeIdValue<PacketType>();
+    return typeIdValue< ConcretePacket<PacketType> >();
 }
 
 template <class PacketType>
@@ -220,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;
 }
@@ -231,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;
 }
@@ -251,10 +253,10 @@ senf::PacketInterpreter<PacketType>::FactoryImpl::create()
 
 template <class PacketType>
 prefix_ typename senf::PacketInterpreterBase::ptr
-senf::PacketInterpreter<PacketType>::FactoryImpl::create(NoInit_t)
+senf::PacketInterpreter<PacketType>::FactoryImpl::create(senf::NoInit_t)
     const
 {
-    return senf::PacketInterpreter<PacketType>::create(noinit);
+    return senf::PacketInterpreter<PacketType>::create(senf::noinit);
 }
 
 template <class PacketType>
@@ -267,10 +269,10 @@ senf::PacketInterpreter<PacketType>::FactoryImpl::create(size_type size)
 
 template <class PacketType>
 prefix_ typename senf::PacketInterpreterBase::ptr
-senf::PacketInterpreter<PacketType>::FactoryImpl::create(size_type size, NoInit_t)
+senf::PacketInterpreter<PacketType>::FactoryImpl::create(size_type size, senf::NoInit_t)
     const
 {
-    return senf::PacketInterpreter<PacketType>::create(size, noinit);
+    return senf::PacketInterpreter<PacketType>::create(size, senf::noinit);
 }
 
 // Create packet as new packet after a given packet
@@ -286,10 +288,10 @@ senf::PacketInterpreter<PacketType>::FactoryImpl::createAfter(PacketInterpreterB
 template <class PacketType>
 prefix_ typename senf::PacketInterpreterBase::ptr
 senf::PacketInterpreter<PacketType>::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet,
-                                                              NoInit_t)
+                                                              senf::NoInit_t)
     const
 {
-    return senf::PacketInterpreter<PacketType>::createAfter(packet,noinit);
+    return senf::PacketInterpreter<PacketType>::createAfter(packet,senf::noinit);
 }
 
 template <class PacketType>
@@ -304,10 +306,10 @@ senf::PacketInterpreter<PacketType>::FactoryImpl::createAfter(PacketInterpreterB
 template <class PacketType>
 prefix_ typename senf::PacketInterpreterBase::ptr
 senf::PacketInterpreter<PacketType>::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet,
-                                                              size_type size, NoInit_t)
+                                                              size_type size, senf::NoInit_t)
     const
 {
-    return senf::PacketInterpreter<PacketType>::createAfter(packet,size,noinit);
+    return senf::PacketInterpreter<PacketType>::createAfter(packet,size,senf::noinit);
 }
 
 // Create packet as new packet (header) before a given packet
@@ -324,10 +326,10 @@ createBefore(PacketInterpreterBase::ptr packet)
 template <class PacketType>
 prefix_ senf::PacketInterpreterBase::ptr
 senf::PacketInterpreter<PacketType>::FactoryImpl::
-createBefore(PacketInterpreterBase::ptr packet, NoInit_t)
+createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t)
     const
 {
-    return senf::PacketInterpreter<PacketType>::createBefore(packet,noinit);
+    return senf::PacketInterpreter<PacketType>::createBefore(packet,senf::noinit);
 }
 
 // Parse next packet in chain