// $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 <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
BOOST_CHECK_EQUAL( pi2->data().size(), 1u );
BOOST_CHECK_EQUAL( pi2b->data().size(), 2u );
- BOOST_CHECK_EQUAL( pi1->data().size(), pi1->nextPacketRange()->size() );
+ BOOST_CHECK_EQUAL( pi1->data().size(), unsigned(pi1->nextPacketRange()->size()) );
pi1->append(pi2b);
BOOST_CHECK_EQUAL( pi1->data().size(), 2u );
BOOST_REQUIRE( pi1->next() );
{
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 );
}
(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 );
}
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) );
}
{
senf::PacketInterpreter<OtherPacket>::ptr p3
(senf::PacketInterpreter<OtherPacket>::createBefore(
- p,senf::PacketInterpreterBase::noinit));
+ p,senf::noinit));
BOOST_CHECK_EQUAL( p3->data().size(), 10u );
}
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 );
{
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() );
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() );
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 );
senf::PacketInterpreterBase::ptr p2 (p->parseNextAs(factory));
BOOST_CHECK( p2->is<OtherPacket>() );
BOOST_CHECK( ! p2->is<VoidPacket>() );
- BOOST_CHECK_EQUAL( boost::size(*p2->nextPacketRange()), 4u );
+ BOOST_CHECK_EQUAL( unsigned(boost::size(*p2->nextPacketRange())), 4u );
}
}