From: tho Date: Thu, 9 Dec 2010 15:45:42 +0000 (+0000) Subject: some #include improvements X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=5cb66935d4b2973ea0fe7487b862b9ddc31648f4;p=senf.git some #include improvements git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1754 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/senf/PPI/ActiveFeeder.cc b/senf/PPI/ActiveFeeder.cc index a002a7c..6badba2 100644 --- a/senf/PPI/ActiveFeeder.cc +++ b/senf/PPI/ActiveFeeder.cc @@ -35,8 +35,12 @@ //-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::ppi::module::ActiveFeeder -//-///////////////////////////////////////////////////////////////////////////////////////////////// -// private members +prefix_ senf::ppi::module::ActiveFeeder::ActiveFeeder() +{ + route(input,idle_); + route(idle_,output); + registerEvent(idle_, &ActiveFeeder::request); +} prefix_ void senf::ppi::module::ActiveFeeder::request() { diff --git a/senf/PPI/ActiveFeeder.cci b/senf/PPI/ActiveFeeder.cci deleted file mode 100644 index 105d586..0000000 --- a/senf/PPI/ActiveFeeder.cci +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ -// -// 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 -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -/** \file - \brief ActiveFeeder inline non-template implementation */ - -// Custom includes - -#define prefix_ inline -//-///////////////////////////////////////////////////////////////////////////////////////////////// - -//-///////////////////////////////////////////////////////////////////////////////////////////////// -// senf::ppi::module::ActiveFeeder - -prefix_ senf::ppi::module::ActiveFeeder::ActiveFeeder() -{ - route(input,idle_); - route(idle_,output); - registerEvent(idle_, & ActiveFeeder::request); -} - -//-///////////////////////////////////////////////////////////////////////////////////////////////// -#undef prefix_ - - -// Local Variables: -// mode: c++ -// fill-column: 100 -// comment-column: 40 -// c-file-style: "senf" -// indent-tabs-mode: nil -// ispell-local-dictionary: "american" -// compile-command: "scons -u test" -// End: diff --git a/senf/PPI/ActiveFeeder.hh b/senf/PPI/ActiveFeeder.hh index 5f0bfda..50afe9f 100644 --- a/senf/PPI/ActiveFeeder.hh +++ b/senf/PPI/ActiveFeeder.hh @@ -68,7 +68,7 @@ namespace module { }}} //-///////////////////////////////////////////////////////////////////////////////////////////////// -#include "ActiveFeeder.cci" +//#include "ActiveFeeder.cci" //#include "ActiveFeeder.ct" //#include "ActiveFeeder.cti" #endif diff --git a/senf/PPI/Duplicators.cc b/senf/PPI/Duplicators.cc index dfde54b..01ad934 100644 --- a/senf/PPI/Duplicators.cc +++ b/senf/PPI/Duplicators.cc @@ -32,8 +32,13 @@ #define prefix_ //-///////////////////////////////////////////////////////////////////////////////////////////////// -prefix_ void -senf::ppi::module::ActiveDuplicator::connectorSetup(ActiveDuplicator::ConnectorType & conn) +prefix_ senf::ppi::module::ActiveDuplicator::ActiveDuplicator() +{ + noroute(input); + input.onRequest(&ActiveDuplicator::request); +} + +prefix_ void senf::ppi::module::ActiveDuplicator::connectorSetup(ConnectorType & conn) { route(input, conn); } @@ -41,8 +46,8 @@ senf::ppi::module::ActiveDuplicator::connectorSetup(ActiveDuplicator::ConnectorT prefix_ void senf::ppi::module::ActiveDuplicator::request() { Packet p (input()); - ActiveDuplicator::ContainerType::iterator i (connectors().begin()); - ActiveDuplicator::ContainerType::iterator const i_end (connectors().end()); + ContainerType::iterator i (connectors().begin()); + ContainerType::iterator const i_end (connectors().end()); for (; i != i_end; ++i) (*i)(p); } diff --git a/senf/PPI/Duplicators.cci b/senf/PPI/Duplicators.cci deleted file mode 100644 index e936e88..0000000 --- a/senf/PPI/Duplicators.cci +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ -// -// Copyright (C) 2009 -// 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 -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -/** \file - \brief Duplicators inline non-template implementation */ - -//#include "Duplicators.ih" - -// Custom includes - -#define prefix_ inline -//-///////////////////////////////////////////////////////////////////////////////////////////////// - -//-///////////////////////////////////////////////////////////////////////////////////////////////// -// senf::ppi::module::ActiveDuplicator - -prefix_ senf::ppi::module::ActiveDuplicator::ActiveDuplicator() -{ - noroute(input); - input.onRequest(&ActiveDuplicator::request); -} - -//-///////////////////////////////////////////////////////////////////////////////////////////////// -#undef prefix_ - - -// Local Variables: -// mode: c++ -// fill-column: 100 -// comment-column: 40 -// c-file-style: "senf" -// indent-tabs-mode: nil -// ispell-local-dictionary: "american" -// compile-command: "scons -u test" -// End: diff --git a/senf/PPI/Duplicators.hh b/senf/PPI/Duplicators.hh index b9d4c4c..aadeb6f 100644 --- a/senf/PPI/Duplicators.hh +++ b/senf/PPI/Duplicators.hh @@ -27,8 +27,6 @@ #define HH_SENF_PPI_Duplicators_ 1 // Custom includes -#include -#include "predecl.hh" #include "Connectors.hh" #include "Module.hh" #include "MultiConnectorMixin.hh" @@ -44,17 +42,6 @@ namespace module { ActiveDuplicator will take every received packet and push it out to each connected output. - Since ActiveDuplicator allows any number of incoming packet streams, the input connectors - are dynamically managed. A special senf::ppi::connect() overload is used to dynamically - create the needed input connectors. This hides this extra functionality from the user. - \code - senf::ppi::module::ActiveDuplicator dup; - - senf::ppi::connect(sourceModule, dup); - senf::ppi::connect(dup, targetModule1); - senf::ppi::connect(dup, targetModule2.some_input); - \endcode - \ingroup routing_modules */ class ActiveDuplicator @@ -79,7 +66,7 @@ namespace module { //-///////////////////////////////////////////////////////////////////////////////////////////////// -#include "Duplicators.cci" +//#include "Duplicators.cci" //#include "Duplicators.ct" //#include "Duplicators.cti" #endif diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh index 928ec03..22d3a13 100644 --- a/senf/PPI/MultiConnectorMixin.hh +++ b/senf/PPI/MultiConnectorMixin.hh @@ -31,8 +31,6 @@ #include #include #include -#include "Connectors.hh" -#include "Setup.hh" #ifndef SENF_MULTI_CONNECTOR_MAX_ARGS #define SENF_MULTI_CONNECTOR_MAX_ARGS 3 diff --git a/senf/PPI/MultiConnectorMixin.ih b/senf/PPI/MultiConnectorMixin.ih index 02aca14..0739431 100644 --- a/senf/PPI/MultiConnectorMixin.ih +++ b/senf/PPI/MultiConnectorMixin.ih @@ -27,6 +27,7 @@ #define IH_SENF_PPI_MultiConnectorMixin_ 1 // Custom includes +#include "Setup.hh" //-///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/senf/Packets/80211Bundle/WLANBeaconPacket.cc b/senf/Packets/80211Bundle/WLANBeaconPacket.cc index 63a6abb..d18abf1 100644 --- a/senf/Packets/80211Bundle/WLANBeaconPacket.cc +++ b/senf/Packets/80211Bundle/WLANBeaconPacket.cc @@ -23,10 +23,9 @@ // Definition of 802.11 WLAN Beacon Packet non-inline non-template functions -// Custom includes #include "WLANBeaconPacket.hh" -#include +// Custom includes #include #define prefix_ diff --git a/senf/Packets/80221Bundle/TLVParser.hh b/senf/Packets/80221Bundle/TLVParser.hh index 68fa4db..2c4fc7d 100644 --- a/senf/Packets/80221Bundle/TLVParser.hh +++ b/senf/Packets/80221Bundle/TLVParser.hh @@ -27,7 +27,6 @@ #define HH_SENF_Packets_80221Bundle_TLVParser_ 1 // Custom includes -#include #include #include "MIHTypes.hh" diff --git a/senf/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh index 08e96ee..b317c32 100644 --- a/senf/Packets/DefaultBundle/EthernetPacket.hh +++ b/senf/Packets/DefaultBundle/EthernetPacket.hh @@ -27,7 +27,6 @@ #define HH_SENF_Packets_DefaultBundle_EthernetPacket_ 1 // Custom includes -#include #include #include diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc index fe35c11..4420c07 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc @@ -22,11 +22,10 @@ // Definition of non-inline non-template functions -// Custom includes -#include -#include "ICMPv6Packet.hh" #include "ICMPv6TypePacket.hh" +// Custom includes + #define prefix_ //-///////////////////////////////////////////////////////////////////////////////////////////////// @@ -46,6 +45,24 @@ namespace { SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 143, senf::MLDv2ListenerReport ); } +prefix_ void senf::ICMPv6ErrDestUnreachableParser::setErrCode(int code) +{ + ICMPv6Packet icmpv6 (Packet().rfind(senf::nothrow)); + icmpv6->code() = code; +} + +prefix_ void senf::ICMPv6ErrParamProblemParser::setErrCode(int code) +{ + ICMPv6Packet icmpv6 (packet().rfind(senf::nothrow)); + icmpv6->code() = code; +} + +prefix_ void senf::ICMPv6ErrTimeExceededParser::setErrCode(int code) +{ + ICMPv6Packet icmpv6 (packet().rfind(senf::nothrow)); + icmpv6->code() = code; +} + prefix_ void senf::ICMPv6EchoRequestType::dump(packet p, std::ostream & os) { os << "ICMPv6 Echo Request:\n" @@ -94,8 +111,8 @@ prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os) << senf::fieldName("Querier's Robustness Variable") << unsigned(p->qrv()) << "\n" << senf::fieldName("Querier's Query Interval Code") << unsigned(p->qqic()) << "\n" << " Source Addresses:\n"; - senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container c (p->srcAddresses()); - senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container::iterator i (c.begin()); + parser::srcAddresses_t::container c (p->srcAddresses()); + parser::srcAddresses_t::container::iterator i (c.begin()); for (unsigned int nr =1; i != c.end(); ++i, ++nr) os << " " << nr << ".) " << *i << "\n"; os << "\n"; @@ -129,10 +146,10 @@ prefix_ void senf::NDPRouterSolicitationMessageType::dump(packet p, std::ostream { os << "ICMPv6 Neighbor Discovery Router Solicitation Message:\n" << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n"; - senf::NDPRouterSolicitationMessage::Parser::options_t::container optC(p->options() ); - senf::NDPRouterSolicitationMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + parser::options_t::container optC (p->options()); + parser::options_t::container::const_iterator listIter (optC.begin()); for (; listIter != optC.end(); ++listIter) { - listIter->dump(os); + listIter->dump(os); } } @@ -146,8 +163,8 @@ prefix_ void senf::NDPRouterAdvertisementMessageType::dump(packet p, std::ostrea << senf::fieldName("Router Lifetime") << unsigned(p->routerLifetime()) << "\n" << senf::fieldName("Reachable Time") << unsigned(p->reachableTime()) << "\n" << senf::fieldName("Retrans Timer") << unsigned(p->retransTimer()) << "\n"; - senf::NDPRouterAdvertisementMessage::Parser::options_t::container optC(p->options() ); - senf::NDPRouterAdvertisementMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + parser::options_t::container optC (p->options()); + parser::options_t::container::const_iterator listIter (optC.begin()); for (; listIter != optC.end(); ++listIter) { listIter->dump(os); } @@ -158,8 +175,8 @@ prefix_ void senf::NDPNeighborSolicitationMessageType::dump(packet p, std::ostre os << "ICMPv6 Neighbor Discovery Neighbor Solicitation Message:\n" << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n" << senf::fieldName("Target Address") << p->target() << "\n"; - senf::NDPNeighborSolicitationMessage::Parser::options_t::container optC(p->options() ); - senf::NDPNeighborSolicitationMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + parser::options_t::container optC (p->options()); + parser::options_t::container::const_iterator listIter (optC.begin()); for (; listIter != optC.end(); ++listIter) { listIter->dump(os); } @@ -173,8 +190,8 @@ prefix_ void senf::NDPNeighborAdvertisementMessageType::dump(packet p, std::ostr << senf::fieldName("Override Flag") << unsigned(p->o()) << "\n" << senf::fieldName("Reserved(29Bit)") << unsigned(p->reserved()) << "\n" << senf::fieldName("Target Address") << p->target() << "\n"; - senf::NDPNeighborAdvertisementMessage::Parser::options_t::container optC(p->options() ); - senf::NDPNeighborAdvertisementMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + parser::options_t::container optC(p->options() ); + parser::options_t::container::const_iterator listIter (optC.begin()); for (; listIter != optC.end(); ++listIter) { listIter->dump(os); } @@ -186,10 +203,10 @@ prefix_ void senf::NDPRedirectMessageType::dump(packet p, std::ostream & os) << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n" << senf::fieldName("Target Address") << p->target() << "\n" << senf::fieldName("Destination Address") << p->destination() << "\n"; - senf::NDPRedirectMessage::Parser::options_t::container optC(p->options() ); - senf::NDPRedirectMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + parser::options_t::container optC(p->options() ); + parser::options_t::container::const_iterator listIter (optC.begin()); for (; listIter != optC.end(); ++listIter) { - listIter->dump(os); + listIter->dump(os); } } //-///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh index f850c4f..d842d60 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh @@ -27,10 +27,8 @@ // Custom includes #include -#include "IPv6Packet.hh" -#include "ICMPv6Packet.hh" -#include "ListOptionTypeParser.hh" #include "NDPOptions.hh" +#include "ICMPv6Packet.hh" //-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { @@ -136,10 +134,7 @@ namespace senf { 4 - Port unreachable 5 - Source address failed ingress/egress policy 6 - Reject route to destination */ - void setErrCode(int code) { - ICMPv6Packet icmpv6 (senf::Packet().rfind(senf::nothrow)); - icmpv6->code() = code; - } + void setErrCode(int code); SENF_PARSER_FINALIZE ( ICMPv6ErrDestUnreachableParser ); }; @@ -227,11 +222,7 @@ namespace senf { SENF_PARSER_FIELD ( unused, UInt32Parser ); /* Code 0 - Hop limit exceeded in transit 1 - Fragment reassembly time exceeded */ - void setErrCode(int code) - { - ICMPv6Packet icmpv6 (packet().rfind(senf::nothrow)); - icmpv6->code() = code; - } + void setErrCode(int code); SENF_PARSER_FINALIZE ( ICMPv6ErrTimeExceededParser ); }; @@ -275,11 +266,8 @@ namespace senf { 1 - Unrecognized Next Header type encountered 2 - Unrecognized IPv6 option encountered */ - void setErrCode(int code) - { - ICMPv6Packet icmpv6 (packet().rfind(senf::nothrow)); - icmpv6->code() = code; - } + void setErrCode(int code); + SENF_PARSER_FINALIZE ( ICMPv6ErrParamProblemParser ); }; diff --git a/senf/Packets/DefaultBundle/IPv4Packet.cc b/senf/Packets/DefaultBundle/IPv4Packet.cc index 3c5d9be..7800b97 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.cc +++ b/senf/Packets/DefaultBundle/IPv4Packet.cc @@ -28,9 +28,6 @@ // Custom includes #include -#include -#include -#include #include #include #include "EthernetPacket.hh" diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc index a777f6f..94fbafc 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc @@ -28,7 +28,6 @@ //#include "IPv6Extensions.ih" // Custom includes -#include //#include "IPv6Extensions.mpp" #define prefix_ diff --git a/senf/Packets/DefaultBundle/LlcSnapPacket.hh b/senf/Packets/DefaultBundle/LlcSnapPacket.hh index 39fc1cf..79ff39c 100644 --- a/senf/Packets/DefaultBundle/LlcSnapPacket.hh +++ b/senf/Packets/DefaultBundle/LlcSnapPacket.hh @@ -27,9 +27,7 @@ #define HH_SENF_Packets_DefaultBundle_LlcSnapPacket_ 1 // Custom includes -#include #include "EthernetPacket.hh" -#include //#include "LlcSnapPacket.mpp" //-///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc index 4449d13..20fb1b2 100644 --- a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc +++ b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc @@ -23,7 +23,6 @@ // Definition of non-inline non-template functions // Custom includes - #include "ICMPv6Packet.hh" #include "ICMPv6TypePacket.hh" #include diff --git a/senf/Packets/DefaultBundle/RTPPacket.cc b/senf/Packets/DefaultBundle/RTPPacket.cc index 1e4b408..d9ad1ed 100644 --- a/senf/Packets/DefaultBundle/RTPPacket.cc +++ b/senf/Packets/DefaultBundle/RTPPacket.cc @@ -24,12 +24,12 @@ \brief RTPPacket non-inline non-template implementation */ #include "RTPPacket.hh" -//#include "UDPPacket.ih" // Custom includes #include #define prefix_ +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -61,7 +61,7 @@ namespace } } -prefix_ void senf::RTPPacketType::dump(packet p, std::ostream &os) +prefix_ void senf::RTPPacketType::dump(packet p, std::ostream & os) { boost::io::ios_all_saver ias(os); os << "Real Time Protocol:\n" @@ -77,4 +77,5 @@ prefix_ void senf::RTPPacketType::dump(packet p, std::ostream &os) << senf::fieldName("sync source id") << p->synSourceId() << "\n"; } +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ diff --git a/senf/Packets/DefaultBundle/RTPPacket.hh b/senf/Packets/DefaultBundle/RTPPacket.hh index 39aaaeb..421e668 100644 --- a/senf/Packets/DefaultBundle/RTPPacket.hh +++ b/senf/Packets/DefaultBundle/RTPPacket.hh @@ -23,14 +23,13 @@ /** \file \brief RTPPacket public header */ -// Custom includes #ifndef HH_SENF_Packets_DefaultBundle_RTPPacket_ -#define HH_SENF_Packets_DefaultBundle_RTPPacket_ +#define HH_SENF_Packets_DefaultBundle_RTPPacket_ 1 +// Custom includes #include -#include - +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { struct RTPPacketParser : public PacketParserBase @@ -43,12 +42,13 @@ namespace senf { SENF_PARSER_BITFIELD ( marker, 1, bool ); //Marker M=1, used to signal speech silent compression; further use in combination with PT to be defined SENF_PARSER_BITFIELD ( payloadType, 7, unsigned ); //Payload Type; e.g. PCM=8 (RFC 3550) SENF_PARSER_FIELD ( seqNumber, UInt16Parser ); //random number to identify initial segment of a stream, increment by 1 used to resequence segments at receiver - SENF_PARSER_FIELD ( timeStamp, UInt32Parser ); //signals sampling time of 1st byte of payload; initialised; used to calculate Jitter between segments - SENF_PARSER_FIELD ( synSourceId, UInt32Parser ); //Synchronisation source identifier; identifier of RFTP stream source (random number) in case of conferencing identifier of mixer + SENF_PARSER_FIELD ( timeStamp, UInt32Parser ); //signals sampling time of 1st byte of payload; initialized; used to calculate Jitter between segments + SENF_PARSER_FIELD ( synSourceId, UInt32Parser ); //Synchronization source identifier; identifier of RFTP stream source (random number) in case of conferencing identifier of mixer SENF_PARSER_VECTOR (csrcOpt, csrcCount, UInt32Parser ); - bool valid() const {return version() == 2;} SENF_PARSER_FINALIZE(RTPPacketParser); + + bool valid() const { return version() == 2; } }; struct RTPPacketType @@ -69,4 +69,6 @@ namespace senf { typedef RTPPacketType::packet RTPPacket; } + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif diff --git a/senf/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc index f3e3d68..02476f4 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.cc +++ b/senf/Packets/DefaultBundle/TCPPacket.cc @@ -29,9 +29,7 @@ // Custom includes #include #include -#include #include -#include "IPv4Packet.hh" #include "IPv6Packet.hh" #define prefix_ diff --git a/senf/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc index a867f28..6a9f03b 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.cc +++ b/senf/Packets/DefaultBundle/UDPPacket.cc @@ -29,9 +29,7 @@ // Custom includes #include #include -#include #include -#include "IPv4Packet.hh" #include "IPv6Packet.hh" #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.cc b/senf/Packets/MPEGDVBBundle/DTCPPacket.cc index 39c8d2a..2b7b2b3 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.cc +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.cc @@ -23,11 +23,10 @@ /** \file \brief DTCPPacket non-inline non-template implementation */ -//#include "DTCPPacket.hh" +#include "DTCPPacket.hh" //#include "DTCPPacket.ih" // Custom includes -#include "DTCPPacket.hh" #include #include diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh index 4b9e675..9a5fac6 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh @@ -27,8 +27,6 @@ #define HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_ 1 // Custom includes -#include -#include #include //#include "DTCPPacket.mpp" diff --git a/senf/Packets/MPEGDVBBundle/GREPacket.hh b/senf/Packets/MPEGDVBBundle/GREPacket.hh index c5ab551..612034b 100644 --- a/senf/Packets/MPEGDVBBundle/GREPacket.hh +++ b/senf/Packets/MPEGDVBBundle/GREPacket.hh @@ -23,12 +23,10 @@ /** \file \brief GREPacket public header */ -#ifndef HH_GREPacket -#define HH_GREPacket 1 +#ifndef HH_SENF_Packets_MPEGDVBBundle_GREPacket_ +#define HH_SENF_Packets_MPEGDVBBundle_GREPacket_ 1 // Custom includes -#include -#include #include //#include "GREPacket.mpp" diff --git a/senf/Packets/MPEGDVBBundle/MPESection.hh b/senf/Packets/MPEGDVBBundle/MPESection.hh index ec56b10..0afe014 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.hh +++ b/senf/Packets/MPEGDVBBundle/MPESection.hh @@ -28,7 +28,6 @@ // Custom includes #include -#include #include //#include "MPESection.mpp" diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc index df35a31..00acdf1 100644 --- a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc +++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc @@ -28,8 +28,6 @@ // Custom includes #include -#include - #define prefix_ //-///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh index d8633c7..af99034 100644 --- a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh +++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh @@ -27,7 +27,6 @@ #define HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_ 1 // Custom includes -#include #include #include #include diff --git a/senf/Utils/IgnoreValue.hh b/senf/Utils/IgnoreValue.hh index 366eaf2..591a38a 100644 --- a/senf/Utils/IgnoreValue.hh +++ b/senf/Utils/IgnoreValue.hh @@ -35,7 +35,7 @@ namespace senf { /** \brief Explicitly ignore a value - To explicitly ingore a value (e.g. the return value of a function), pass that value to + To explicitly ignore a value (e.g. the return value of a function), pass that value to senf::IGNORE(). This has the added benefit of silencing \em any warnings about ignored values by g++. */