X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.hh;h=8286e88fc1c180a054d3245c329cc1b5674e7741;hb=6165e70feef7199dc3fe96a881d055f6a2999b00;hp=aadcddeac08fc04c3c74182a6c0f05e18376b256;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh index aadcdde..8286e88 100644 --- a/Packets/DefaultBundle/EthernetPacket.hh +++ b/Packets/DefaultBundle/EthernetPacket.hh @@ -23,8 +23,8 @@ /** \file \brief EthernetPacket public header */ -#ifndef HH_EthernetPacket_ -#define HH_EthernetPacket_ 1 +#ifndef HH_SENF_Packets_DefaultBundle_EthernetPacket_ +#define HH_SENF_Packets_DefaultBundle_EthernetPacket_ 1 // Custom includes #include @@ -96,6 +96,7 @@ namespace senf { \par Fields: \ref EthernetPacketParser + \image html EthernetPacket.png \par Associated registries: \ref EtherTypes @@ -109,11 +110,10 @@ namespace senf { : public PacketTypeBase, public PacketTypeMixin { -#ifndef DOXYGEN typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef EthernetPacketParser parser; -#endif + using mixin::nextPacketRange; using mixin::initSize; using mixin::init; @@ -152,7 +152,8 @@ namespace senf { \par Fields: \ref EthVLanPacketParser - + \image html EthVLanPacket.png + \par Associated registries: \ref EtherTypes @@ -165,11 +166,10 @@ namespace senf { : public PacketTypeBase, public PacketTypeMixin { -#ifndef DOXYGEN typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef EthVLanPacketParser parser; -#endif + using mixin::nextPacketRange; using mixin::nextPacketType; using mixin::initSize;