Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Packets / DefaultBundle / IPv6Packet.cc

diff --git a/senf/Packets/DefaultBundle/IPv6Packet.cc b/senf/Packets/DefaultBundle/IPv6Packet.cc
index 4599276..b7e4dd7 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6Packet.cc
+++ b/senf/Packets/DefaultBundle/IPv6Packet.cc
@@ -33,30 +33,27 @@
 
 //#include "IPv6Packet.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::EtherTypes>::RegistrationProxy<senf::IPv6Packet>
-        registerIPv6Packet (0x86dd);
-
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Packet>
-        registerIPv6Packet2 (41); // IP6-in-IP(6) encapsulation
+    SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x86dd, senf::IPv6Packet);
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes,    41,     senf::IPv6Packet); // IP6-in-IP(6) encapsulation
 }
 
 prefix_ void senf::IPv6PacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
-    os <<     "Internet protocol Version 6:\n"
-       <<     "  version                 : " << unsigned(p->version()) << "\n"
-       <<     "  traffic class           : 0x" 
-         << std::hex << std::setw(2) << std::setfill('0') << unsigned(p->trafficClass()) << "\n"
-       <<     "  flow label              : 0x" 
-         << std::hex << std::setw(5) << std::setfill('0') << unsigned(p->flowLabel()) << "\n"
-       <<     "  payload length          : " << std::dec << unsigned(p->length()) << "\n"
-       <<     "  next header             : " << unsigned(p->nextHeader()) << "\n"
-       <<     "  hop limit               : " << unsigned(p->hopLimit()) << "\n"
-       <<     "  source                  : " << p->source() << "\n"
-       <<     "  destination             : " << p->destination() << "\n";
+    os << "Internet protocol Version 6:\n"
+       << senf::fieldName("version")                   << unsigned(p->version()) << "\n"
+       << senf::fieldName("traffic class")
+       << "0x" << std::hex << std::setw(2) << std::setfill('0') << unsigned(p->trafficClass()) << "\n"
+       << senf::fieldName("flow label")
+       << "0x" << std::hex << std::setw(5) << std::setfill('0') << unsigned(p->flowLabel()) << "\n"
+       << senf::fieldName("payload length")            << std::dec << unsigned(p->length()) << "\n"
+       << senf::fieldName("next header")               << unsigned(p->nextHeader()) << "\n"
+       << senf::fieldName("hop limit")                 << unsigned(p->hopLimit()) << "\n"
+       << senf::fieldName("source")                    << p->source() << "\n"
+       << senf::fieldName("destination")               << p->destination() << "\n";
 }
 
 prefix_ void senf::IPv6PacketType::finalize(packet p)
@@ -70,7 +67,7 @@ prefix_ void senf::IPv6PacketType::finalize(packet p)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "IPv6Packet.mpp"