Skip to content
Snippets Groups Projects
Commit 9b3a4183 authored by g0dil's avatar g0dil
Browse files

Utils: Implement Tags.hh and move 'senf::noinit' and 'senf::nothrow' there 

Adjust all senf components to use Utils/Tags.hh (if necessary)
parent fee5774e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 93 deletions
Examples/DVBAdapter/ULEdec.cc
+ 1
− 1
View file @ 9b3a4183
......@@ -63,7 +63,7 @@ ULEdec::ULEdec(unsigned short adapter, unsigned short device)
void ULEdec::handleEvent(senf::Scheduler::EventId event)
{
senf::TransportPacket ts_packet (
senf::TransportPacket::create(188, senf::TransportPacket::noinit));
senf::TransportPacket::create(188, senf::noinit));
dvrHandle.read( ts_packet.data() );
// Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control.
......
Examples/Sniffer/Sniffer.cc
+ 2
− 2
View file @ 9b3a4183
......@@ -48,7 +48,7 @@ int loop_main (int argc, char const * argv[])
while (true) { // forever
senf::EthernetPacket packet (senf::EthernetPacket::create(
senf::EthernetPacket::noinit));
senf::noinit));
sock.read(packet.data(),0);
packet.dump(std::cout);
senf::hexdump(
......@@ -85,7 +85,7 @@ private:
void dumpPacket(senf::Scheduler::EventId event)
{
senf::EthernetPacket packet (
senf::EthernetPacket::create(senf::EthernetPacket::noinit));
senf::EthernetPacket::create(senf::noinit));
sock.read(packet.data(),0);
packet.dump(std::cout);
senf::hexdump(
......
PPI/SocketSource.ct
+ 1
− 1
View file @ 9b3a4183
......@@ -36,7 +36,7 @@
template <class Packet>
prefix_ Packet senf::ppi::DgramReader<Packet>::operator()(Handle handle)
{
Packet packet (Packet::create(Packet::noinit));
Packet packet (Packet::create(senf::noinit));
handle.read(packet.data(),0u);
return packet;
}
......
Packets/Mainpage.dox
+ 1
− 1
View file @ 9b3a4183
......@@ -125,7 +125,7 @@
\code
senf::PacketSocketHandle sock ("eth0");
senf::EthernetPacket packet (senf::EthernetPacket::create(senf::Packet::noinit));
senf::EthernetPacket packet (senf::EthernetPacket::create(senf::noinit));
sock.read(packet.data(),0u);
\endcode
......
Packets/Packet.cti
+ 10
− 10
View file @ 9b3a4183
......@@ -154,9 +154,9 @@ senf::ConcretePacket<PacketType>::create()
template <class PacketType>
prefix_ senf::ConcretePacket<PacketType>
senf::ConcretePacket<PacketType>::create(NoInit_t)
senf::ConcretePacket<PacketType>::create(senf::NoInit_t)
{
return ConcretePacket(interpreter::create(interpreter::noinit));
return ConcretePacket(interpreter::create(senf::noinit));
}
template <class PacketType>
......@@ -168,9 +168,9 @@ senf::ConcretePacket<PacketType>::create(size_type size)
template <class PacketType>
prefix_ senf::ConcretePacket<PacketType>
senf::ConcretePacket<PacketType>::create(size_type size, NoInit_t)
senf::ConcretePacket<PacketType>::create(size_type size, senf::NoInit_t)
{
return ConcretePacket(interpreter::create(size,interpreter::noinit));
return ConcretePacket(interpreter::create(size,senf::noinit));
}
template <class PacketType>
......@@ -192,9 +192,9 @@ senf::ConcretePacket<PacketType>::createAfter(Packet packet)
template <class PacketType>
prefix_ senf::ConcretePacket<PacketType>
senf::ConcretePacket<PacketType>::createAfter(Packet packet, NoInit_t)
senf::ConcretePacket<PacketType>::createAfter(Packet packet, senf::NoInit_t)
{
return ConcretePacket(interpreter::createAfter(packet.ptr(),interpreter::noinit));
return ConcretePacket(interpreter::createAfter(packet.ptr(),senf::noinit));
}
template <class PacketType>
......@@ -206,9 +206,9 @@ senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size)
template <class PacketType>
prefix_ senf::ConcretePacket<PacketType>
senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size, NoInit_t)
senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size, senf::NoInit_t)
{
return ConcretePacket(interpreter::createAfter(packet.ptr(), size, interpreter::noinit));
return ConcretePacket(interpreter::createAfter(packet.ptr(), size, senf::noinit));
}
template <class PacketType>
......@@ -230,9 +230,9 @@ senf::ConcretePacket<PacketType>::createBefore(Packet packet)
template <class PacketType>
prefix_ senf::ConcretePacket<PacketType>
senf::ConcretePacket<PacketType>::createBefore(Packet packet, NoInit_t)
senf::ConcretePacket<PacketType>::createBefore(Packet packet, senf::NoInit_t)
{
return ConcretePacket(interpreter::createBefore(packet.ptr(), interpreter::noinit));
return ConcretePacket(interpreter::createBefore(packet.ptr(), senf::noinit));
}
// Create a clone of the current packet
......
Packets/Packet.hh
+ 11
− 12
View file @ 9b3a4183
......@@ -30,6 +30,7 @@
#include <boost/operators.hpp>
#include "../Utils/Exception.hh"
#include "../Utils/Tags.hh"
#include "../Utils/safe_bool.hh"
#include "PacketInterpreter.hh"
......@@ -149,9 +150,6 @@ namespace senf {
///< Unsigned type to represent packet size
typedef PacketInterpreterBase::factory_t factory_t; ///< Packet factory type (see below)
enum NoInit_t { noinit }; ///< Special argument flag
/**< Used in some ConcretePacket constructors */
///////////////////////////////////////////////////////////////////////////
///\name Structors and default members
///@{
......@@ -446,10 +444,10 @@ namespace senf {
static ConcretePacket create(); ///< Create default initialized packet
/**< The packet will be initialized to it's default empty
state. */
static ConcretePacket create(NoInit_t); ///< Create uninitialized empty packet
static ConcretePacket create(senf::NoInit_t); ///< Create uninitialized empty packet
/**< This will create a completely empty and uninitialized
packet with <tt>size() == 0</tt>.
\param[in] noinit This parameter must always have the
\param[in] senf::noinit This parameter must always have the
value \c senf::noinit. */
static ConcretePacket create(size_type size); ///< Create default initialized packet
/**< This member will create a default initialized packet
......@@ -460,11 +458,12 @@ namespace senf {
\throws TruncatedPacketException if \a size is smaller
than the smallest permissible size for this type of
packet. */
static ConcretePacket create(size_type size, NoInit_t); ///< Create uninitialized packet
static ConcretePacket create(size_type size, senf::NoInit_t);
///< Create uninitialized packet
/**< Creates an uninitialized (all-zero) packet of the exact
given size.
\param[in] size Size of the packet to create in bytes
\param[in] noinit This parameter must always have the
\param[in] senf::noinit This parameter must always have the
value \c senf::noinit. */
template <class ForwardReadableRange>
static ConcretePacket create(ForwardReadableRange const & range);
......@@ -485,14 +484,14 @@ namespace senf {
state. It will be appended as next header/interpreter
after \a packet in that packets interpreter chain.
\param[in] packet Packet to append new packet to. */
static ConcretePacket createAfter(Packet packet, NoInit_t);
static ConcretePacket createAfter(Packet packet, senf::NoInit_t);
///< Create uninitialized empty packet after\a packet
/**< This will create a completely empty and uninitialized
packet with <tt>size() == 0</tt>. It will be appended
as next header/interpreter after \a packet in that
packets interpreter chain.
\param[in] packet Packet to append new packet to.
\param[in] noinit This parameter must always have the
\param[in] senf::noinit This parameter must always have the
value \c senf::noinit. */
static ConcretePacket createAfter(Packet packet, size_type size);
///< Create default initialized packet after \a packet
......@@ -507,7 +506,7 @@ namespace senf {
\throws TruncatedPacketException if \a size is smaller
than the smallest permissible size for this type of
packet. */
static ConcretePacket createAfter(Packet packet, size_type size, NoInit_t);
static ConcretePacket createAfter(Packet packet, size_type size, senf::NoInit_t);
///< Create uninitialized packet after \a packet
/**< Creates an uninitialized (all-zero) packet of the exact
given size. It will be appended as next
......@@ -515,7 +514,7 @@ namespace senf {
interpreter chain.
\param[in] packet Packet to append new packet to.
\param[in] size Size of the packet to create in bytes
\param[in] noinit This parameter must always have the
\param[in] senf::noinit This parameter must always have the
value \c senf::noinit. */
template <class ForwardReadableRange>
static ConcretePacket createAfter(Packet packet,
......@@ -541,7 +540,7 @@ namespace senf {
header/interpreter before \a packet in that packets
interpreter chain.
\param[in] packet Packet to prepend new packet to. */
static ConcretePacket createBefore(Packet packet, NoInit_t);
static ConcretePacket createBefore(Packet packet, senf::NoInit_t);
///< Create uninitialized empty packet before \a packet
/**< Creates a completely empty and uninitialized packet. It
will be prepended as previous header/interpreter before
......
Packets/Packet.test.cc
+ 5
− 5
View file @ 9b3a4183
......@@ -195,10 +195,10 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
senf::PacketData::byte data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
BOOST_CHECK_EQUAL( FooPacket::create().size(), 4u );
BOOST_CHECK_EQUAL( FooPacket::create(FooPacket::noinit).size(), 0u );
BOOST_CHECK_EQUAL( FooPacket::create(senf::noinit).size(), 0u );
BOOST_CHECK_THROW( FooPacket::create(2u), senf::TruncatedPacketException );
BOOST_CHECK_EQUAL( FooPacket::create(10u).size(), 10u );
BOOST_CHECK_EQUAL( FooPacket::create(2u,FooPacket::noinit).size(), 2u );
BOOST_CHECK_EQUAL( FooPacket::create(2u,senf::noinit).size(), 2u );
BOOST_CHECK_EQUAL( FooPacket::create(data).size(), 6u );
senf::Packet packet (FooPacket::create());
......@@ -206,14 +206,14 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet).size(), 4u );
BOOST_CHECK_EQUAL( packet.size(), 8u );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,FooPacket::noinit).size(), 0u );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,senf::noinit).size(), 0u );
BOOST_CHECK_EQUAL( packet.size(), 4u );
BOOST_CHECK_THROW( FooPacket::createAfter(packet,2u), senf::TruncatedPacketException );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,10u).size(), 10u );
BOOST_CHECK_EQUAL( packet.size(), 14u );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,2u,FooPacket::noinit).size(), 2u );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,2u,senf::noinit).size(), 2u );
BOOST_CHECK_EQUAL( packet.size(), 6u );
BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,data).size(), 6u );
......@@ -222,7 +222,7 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
BOOST_CHECK_EQUAL( FooPacket::createBefore(packet).size(), 14u );
BOOST_CHECK_EQUAL( packet.size(), 10u );
BOOST_CHECK_EQUAL( FooPacket::createBefore(packet,FooPacket::noinit).size(), 10u );
BOOST_CHECK_EQUAL( FooPacket::createBefore(packet,senf::noinit).size(), 10u );
BOOST_CHECK_EQUAL( packet.size(), 10u );
BOOST_CHECK( packet.clone() != packet );
......
Packets/PacketInterpreter.ct
+ 18
− 18
View file @ 9b3a4183
......@@ -63,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));
......@@ -86,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;
......@@ -95,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)
......@@ -134,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();
......@@ -143,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());
......@@ -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<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>
......@@ -269,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
......@@ -288,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>
......@@ -306,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
......@@ -326,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
......
Packets/PacketInterpreter.cti
+ 4
− 4
View file @ 9b3a4183
......@@ -75,9 +75,9 @@ senf::PacketInterpreter<PacketType>::create()
template <class PacketType>
prefix_ typename senf::PacketInterpreter<PacketType>::ptr
senf::PacketInterpreter<PacketType>::create(NoInit_t)
senf::PacketInterpreter<PacketType>::create(senf::NoInit_t)
{
return create(0,noinit);
return create(0,senf::noinit);
}
template <class PacketType>
......@@ -101,9 +101,9 @@ senf::PacketInterpreter<PacketType>::createAfter(PacketInterpreterBase::ptr pack
template <class PacketType>
prefix_ typename senf::PacketInterpreter<PacketType>::ptr
senf::PacketInterpreter<PacketType>::createAfter(PacketInterpreterBase::ptr packet, NoInit_t)
senf::PacketInterpreter<PacketType>::createAfter(PacketInterpreterBase::ptr packet, senf::NoInit_t)
{
return createAfter(packet, 0, noinit);
return createAfter(packet, 0, senf::noinit);
}
// Create clone of current packet
......
Packets/PacketInterpreter.hh
+ 16
− 16
View file @ 9b3a4183
......@@ -34,6 +34,7 @@
#include <boost/type_traits/alignment_of.hpp>
#include "../Utils/intrusive_refcount.hh"
#include "../Utils/pool_alloc_mixin.hh"
#include "../Utils/Tags.hh"
#include "PacketData.hh"
#include "../Utils/TypeIdValue.hh"
......@@ -75,7 +76,6 @@ namespace senf {
enum Append_t { Append };
enum Prepend_t { Prepend };
enum NoInit_t { noinit };
/** \brief Internal: Abstract packet factory
......@@ -91,19 +91,19 @@ namespace senf {
// Create completely new packet
virtual ptr create() const = 0;
virtual ptr create(NoInit_t) const = 0;
virtual ptr create(senf::NoInit_t) const = 0;
virtual ptr create(size_type size) const = 0;
virtual ptr create(size_type size, NoInit_t) const = 0;
virtual ptr create(size_type size, senf::NoInit_t) const = 0;
template <class ForwardReadableRange>
ptr create(ForwardReadableRange const & range) const;
// Create packet as new packet after a given packet
virtual ptr createAfter(PacketInterpreterBase::ptr packet) const = 0;
virtual ptr createAfter(PacketInterpreterBase::ptr packet, NoInit_t) const = 0;
virtual ptr createAfter(PacketInterpreterBase::ptr packet, senf::NoInit_t) const = 0;
virtual ptr createAfter(PacketInterpreterBase::ptr packet, size_type size) const = 0;
virtual ptr createAfter(PacketInterpreterBase::ptr packet, size_type size,
NoInit_t) const = 0;
senf::NoInit_t) const = 0;
template <class ForwardReadableRange>
ptr createAfter(PacketInterpreterBase::ptr packet,
ForwardReadableRange const & range) const;
......@@ -111,7 +111,7 @@ namespace senf {
// Create packet as new packet (header) const before a given packet
virtual ptr createBefore(PacketInterpreterBase::ptr packet) const = 0;
virtual ptr createBefore(PacketInterpreterBase::ptr packet, NoInit_t) const = 0;
virtual ptr createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t) const = 0;
// Parse next packet in chain
......@@ -256,18 +256,18 @@ namespace senf {
// Create completely new packet
static ptr create();
static ptr create(NoInit_t);
static ptr create(senf::NoInit_t);
static ptr create(size_type size);
static ptr create(size_type size, NoInit_t);
static ptr create(size_type size, senf::NoInit_t);
template <class ForwardReadableRange>
static ptr create(ForwardReadableRange const & range);
// Create packet as new packet after a given packet
static ptr createAfter(PacketInterpreterBase::ptr packet);
static ptr createAfter(PacketInterpreterBase::ptr packet, NoInit_t);
static ptr createAfter(PacketInterpreterBase::ptr packet, senf::NoInit_t);
static ptr createAfter(PacketInterpreterBase::ptr packet, size_type size);
static ptr createAfter(PacketInterpreterBase::ptr packet, size_type size, NoInit_t);
static ptr createAfter(PacketInterpreterBase::ptr packet, size_type size, senf::NoInit_t);
template <class ForwardReadableRange>
static ptr createAfter(PacketInterpreterBase::ptr packet,
ForwardReadableRange const & range);
......@@ -275,7 +275,7 @@ namespace senf {
// Create packet as new packet (header) before a given packet
static ptr createBefore(PacketInterpreterBase::ptr packet);
static ptr createBefore(PacketInterpreterBase::ptr packet, NoInit_t);
static ptr createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t);
// Create a clone of the current packet
......@@ -333,27 +333,27 @@ namespace senf {
// Create completely new packet
virtual PacketInterpreterBase::ptr create() const;
virtual PacketInterpreterBase::ptr create(NoInit_t) const;
virtual PacketInterpreterBase::ptr create(senf::NoInit_t) const;
virtual PacketInterpreterBase::ptr create(size_type size) const;
virtual PacketInterpreterBase::ptr create(size_type size,NoInit_t) const;
virtual PacketInterpreterBase::ptr create(size_type size,senf::NoInit_t) const;
// Create packet as new packet after a given packet
virtual PacketInterpreterBase::ptr createAfter(PacketInterpreterBase::ptr packet)
const;
virtual PacketInterpreterBase::ptr createAfter(PacketInterpreterBase::ptr packet,
NoInit_t) const;
senf::NoInit_t) const;
virtual PacketInterpreterBase::ptr createAfter(PacketInterpreterBase::ptr packet,
size_type size) const;
virtual PacketInterpreterBase::ptr createAfter(PacketInterpreterBase::ptr packet,
size_type size, NoInit_t) const;
size_type size, senf::NoInit_t) const;
// Create packet as new packet (header) before a given packet
virtual PacketInterpreterBase::ptr createBefore(PacketInterpreterBase::ptr packet)
const;
virtual PacketInterpreterBase::ptr createBefore(PacketInterpreterBase::ptr packet,
NoInit_t)
senf::NoInit_t)
const;
// Parse next packet in chain
......
Packets/PacketInterpreter.test.cc
+ 10
− 10
View file @ 9b3a4183
......@@ -129,9 +129,9 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
{
BOOST_CHECK_NO_THROW(
senf::PacketInterpreter<OtherPacket>::create(4u,senf::PacketInterpreterBase::noinit));
senf::PacketInterpreter<OtherPacket>::create(4u,senf::noinit));
senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(senf::PacketInterpreterBase::noinit));
(senf::PacketInterpreter<OtherPacket>::create(senf::noinit));
BOOST_CHECK_EQUAL( p->data().size(), 0u );
}
......@@ -162,7 +162,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
(senf::PacketInterpreter<OtherPacket>::create(12u));
senf::PacketInterpreter<OtherPacket>::ptr p2
(senf::PacketInterpreter<OtherPacket>::createAfter(
p,senf::PacketInterpreterBase::noinit));
p,senf::noinit));
BOOST_CHECK_EQUAL( p2->data().size(), 0u );
BOOST_CHECK_EQUAL( p->data().size(), 8u );
}
......@@ -178,7 +178,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
BOOST_CHECK_THROW( senf::PacketInterpreter<OtherPacket>::createAfter(p,4u),
senf::TruncatedPacketException );
BOOST_CHECK_NO_THROW( senf::PacketInterpreter<OtherPacket>::createAfter(
p,4u,senf::PacketInterpreterBase::noinit) );
p,4u,senf::noinit) );
}
{
......@@ -204,7 +204,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
senf::PacketInterpreter<OtherPacket>::ptr p3
(senf::PacketInterpreter<OtherPacket>::createBefore(
p,senf::PacketInterpreterBase::noinit));
p,senf::noinit));
BOOST_CHECK_EQUAL( p3->data().size(), 10u );
}
......@@ -225,10 +225,10 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK( factory->create()->is<OtherPacket>() );
BOOST_CHECK_EQUAL( factory->create()->data().size(), 8u );
BOOST_CHECK_EQUAL( factory->create(senf::PacketInterpreterBase::noinit)->data().size(), 0u );
BOOST_CHECK_EQUAL( factory->create(senf::noinit)->data().size(), 0u );
BOOST_CHECK_EQUAL( factory->create(12u)->data().size(), 12u );
BOOST_CHECK_EQUAL(
factory->create(4u, senf::PacketInterpreterBase::noinit)->data().size(), 4u );
factory->create(4u, senf::noinit)->data().size(), 4u );
BOOST_CHECK_EQUAL( factory->create(data)->data().size(), 6u );
{
......@@ -245,7 +245,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK( ! p->next()->next() );
BOOST_CHECK_EQUAL(
factory->createAfter(p, senf::PacketInterpreterBase::noinit)->data().size(), 0u );
factory->createAfter(p, senf::noinit)->data().size(), 0u );
BOOST_CHECK_EQUAL( p->data().size(), 0u );
BOOST_CHECK( ! p->next()->next() );
......@@ -254,7 +254,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK( ! p->next()->next() );
BOOST_CHECK_EQUAL(
factory->createAfter(p,4u, senf::PacketInterpreterBase::noinit)->data().size(), 4u );
factory->createAfter(p,4u, senf::noinit)->data().size(), 4u );
BOOST_CHECK_EQUAL( p->data().size(), 4u );
BOOST_CHECK( ! p->next()->next() );
......@@ -273,7 +273,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK_EQUAL( p->prev()->data().size(), 12u );
BOOST_CHECK_EQUAL(
factory->createBefore(p,senf::PacketInterpreterBase::noinit)->data().size(), 4u );
factory->createBefore(p,senf::noinit)->data().size(), 4u );
BOOST_REQUIRE( p->prev() );
BOOST_CHECK( ! p->prev()->prev() );
BOOST_CHECK_EQUAL( p->prev()->data().size(), 4u );
......
Socket/ProtocolClientSocketHandle.cti
+ 1
− 1
View file @ 9b3a4183
......@@ -37,7 +37,7 @@
template <class SocketProtocol>
prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::
ProtocolClientSocketHandle(UninitializedType)
ProtocolClientSocketHandle(senf::NoInit_t)
{}
template <class SocketProtocol>
......
Socket/ProtocolClientSocketHandle.hh
+ 2
− 2
View file @ 9b3a4183
......@@ -30,6 +30,7 @@
// Custom includes
#include "ClientSocketHandle.hh"
#include "../config.hh"
#include "../Utils/Tags.hh"
#include "ProtocolClientSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
......@@ -66,7 +67,6 @@ namespace senf {
// Types
typedef SocketProtocol Protocol; ///< The sockets protocol
enum UninitializedType { Uninitialized }; ///< Flag to call 'uninitialized' constructor
///////////////////////////////////////////////////////////////////////////
///\name Structors and default members
......@@ -95,7 +95,7 @@ namespace senf {
\implementation The socket handle will have no \c body allocated.
*/
ProtocolClientSocketHandle(UninitializedType);
ProtocolClientSocketHandle(senf::NoInit_t);
///@}
///////////////////////////////////////////////////////////////////////////
......
Socket/ProtocolServerSocketHandle.cti
+ 1
− 1
View file @ 9b3a4183
......@@ -37,7 +37,7 @@
template <class SocketProtocol>
prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::
ProtocolServerSocketHandle(UninitializedType)
ProtocolServerSocketHandle(senf::NoInit_t)
{}
template <class SocketProtocol>
......
Socket/ProtocolServerSocketHandle.hh
+ 2
− 2
View file @ 9b3a4183
......@@ -30,6 +30,7 @@
// Custom includes
#include "ServerSocketHandle.hh"
#include "../config.hh"
#include "../Utils/Tags.hh"
#include "ProtocolServerSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
......@@ -70,7 +71,6 @@ namespace senf {
// Types
typedef SocketProtocol Protocol; ///< The socket protocol
enum UninitializedType { Uninitialized }; ///< Flag to call 'uninitialized' constructor
///////////////////////////////////////////////////////////////////////////
///\name Structors and default members
......@@ -100,7 +100,7 @@ namespace senf {
\implementation The socket handle will have no \c body allocated.
*/
ProtocolServerSocketHandle(UninitializedType);
ProtocolServerSocketHandle(senf::NoInit_t);
///@}
///////////////////////////////////////////////////////////////////////////
......
Socket/Protocols/INet/INet4Address.cci
+ 1
− 1
View file @ 9b3a4183
......@@ -36,7 +36,7 @@ prefix_ senf::INet4Address::INet4Address()
std::fill(begin(), end(), 0u);
}
prefix_ senf::INet4Address::INet4Address(NoInit_t)
prefix_ senf::INet4Address::INet4Address(senf::NoInit_t)
{}
prefix_ senf::INet4Address senf::INet4Address::from_inaddr(inaddr_type v)
......
Socket/Protocols/INet/INet4Address.ct
+ 1
− 1
View file @ 9b3a4183
......@@ -36,7 +36,7 @@
template <class InputIterator>
prefix_ senf::INet4Address senf::INet4Address::from_data(InputIterator i)
{
INet4Address addr (INet4Address::noinit);
INet4Address addr (senf::noinit);
iterator j (addr.begin());
iterator const j_end (addr.end());
for (;j!=j_end;++j,++i)
......
Socket/Protocols/INet/INet4Address.hh
+ 2
− 3
View file @ 9b3a4183
......@@ -33,6 +33,7 @@
#include <boost/array.hpp>
#include <boost/operators.hpp>
#include "../../../Utils/safe_bool.hh"
#include "../../../Utils/Tags.hh"
//#include "INet4Address.mpp"
///////////////////////////////hh.p////////////////////////////////////////
......@@ -69,14 +70,12 @@ namespace senf {
static INet4Address const Loopback; ///< The loopback (127.0.0.1) address
static INet4Address const Broadcast; ////< The global broadcast (255.255.255.255) address
enum NoInit_t { noinit };
///////////////////////////////////////////////////////////////////////////
///\name Structors and default members
///@{
INet4Address(); ///< Construct an empty address
explicit INet4Address(NoInit_t); ///< Construct uninitialized (!) address
explicit INet4Address(senf::NoInit_t); ///< Construct uninitialized (!) address
explicit INet4Address(address_type value);
///< Construct an address constant
......
Socket/Protocols/INet/INet6Address.cci
+ 1
− 1
View file @ 9b3a4183
......@@ -32,7 +32,7 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
prefix_ senf::INet6Address::INet6Address(NoInit_t)
prefix_ senf::INet6Address::INet6Address(senf::NoInit_t)
{}
prefix_ senf::INet6Address::INet6Address(boost::uint16_t a0, boost::uint16_t a1,
......
Socket/Protocols/INet/INet6Address.ct
+ 1
− 1
View file @ 9b3a4183
......@@ -36,7 +36,7 @@
template <class InputIterator>
prefix_ senf::INet6Address senf::INet6Address::from_data(InputIterator i)
{
INet6Address addr (INet6Address::noinit);
INet6Address addr (senf::noinit);
iterator j (addr.begin());
iterator const j_end (addr.end());
for (;j!=j_end;++j,++i)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Datenschutz und Impressum