Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Socket / Protocols / INet / INet6Address.hh

diff --git a/senf/Socket/Protocols/INet/INet6Address.hh b/senf/Socket/Protocols/INet/INet6Address.hh
index 66cc026..54ea4a1 100644 (file)
--- a/senf/Socket/Protocols/INet/INet6Address.hh
+++ b/senf/Socket/Protocols/INet/INet6Address.hh
@@ -36,15 +36,15 @@
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
 #include "INet4Address.hh"
-#include <senf/Socket/Protocols/Raw/MACAddress.hh>
-#include <senf/Socket/Protocols/Raw/EUI64.hh>
 
 //#include "INet6Address.mpp"
 #include "INet6Address.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
+    class EUI64;
+    class MACAddress;
     class INet6Network;
 
     /** \brief INet6 network address
@@ -131,7 +131,7 @@ namespace senf {
           public comparable_safe_bool<INet6Address>
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         static INet6Address const None;        ///< The empty (::0) address
@@ -160,9 +160,9 @@ namespace senf {
             , UnassignedScope   =  6    /**< Unassigned scope, may be defined locally */
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         explicit INet6Address(senf::NoInit_t); ///< Construct uninitialized (!) address
         explicit INet6Address(boost::uint16_t a0=0u, boost::uint16_t a1=0u, boost::uint16_t a2=0u,
@@ -208,22 +208,22 @@ namespace senf {
                                              \par
                                              INet4 compatible INet6 addresses are not directly
                                              supported, they are deprecated in the RFC. */
-        static INet6Address from_mac(senf::MACAddress const & mac);
+        static INet6Address from_mac(MACAddress const & mac);
                                         ///< Construct a link-local INet6 address
                                         /**< This will construct a link local address of the form
                                              <tt>fe80::xxxx:xxff:fexx:xxxx</tt>. */
 
-        static INet6Address from_eui64(senf::EUI64 const & eui);
+        static INet6Address from_eui64(EUI64 const & eui);
                                         ///< Construct link-local INet6 address
                                         /**< This will construct a link local address of the form
                                              <tt>fe80::xxxx:xxxx:xxxx:xxxx</tt>. */
 
         in6_addr toin6_addr() const;    ///< get the linux in6_addr struct (convenience only)
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Accessors
-        ///@{
+        //\{
 
         INet6Network network() const; ///< Return <tt>/64</tt> Network of this address
         bool hasEUI64() const;          ///< \c true, if address is based on an EUID-64
@@ -279,14 +279,14 @@ namespace senf {
 
         bool boolean_test() const;      ///< \c true, if address != '::' (None)
 
-        ///@}
+        //\}
         ///\name Mutators
-        ///@{
+        //\{
 
         void network(boost::uint64_t net); ///< Set network part of address
         void id(boost::uint64_t id);    ///< Set interface id part of address
 
-        ///@}
+        //\}
 
     };
 
@@ -347,17 +347,17 @@ namespace senf {
           public comparable_safe_bool<INet6Network>
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         INet6Network();                 ///< Construct empty (::/0) network
         INet6Network(INet6Address const & address, unsigned prefix_len);
                                         ///< Construct network from given address and prefix length
         explicit INet6Network(std::string const & s); ///< Construct network from CIDR notation
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         INet6Address const & address() const; ///< Get the network address
         unsigned prefix_len() const;    ///< Get the network prefix length
@@ -407,7 +407,7 @@ namespace senf {
     std::istream & operator>>(std::istream & is, INet6Network & addr);
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "INet6Address.cci"
 #include "INet6Address.ct"
 #include "INet6Address.cti"