Logger: use ClockService::now() as timeBase if empty timeFormat is given for a target

[senf.git] / senf / Socket / Protocols / Raw / MACAddress.hh

diff --git a/senf/Socket/Protocols/Raw/MACAddress.hh b/senf/Socket/Protocols/Raw/MACAddress.hh
index 7d49e62..d0d5932 100644 (file)
--- a/senf/Socket/Protocols/Raw/MACAddress.hh
+++ b/senf/Socket/Protocols/Raw/MACAddress.hh
@@ -34,10 +34,9 @@
 #include <boost/type_traits.hpp>
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
-#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "MACAddress.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -45,7 +44,7 @@ namespace senf {
 
     /** \brief Ethernet MAC address
 
-        The Ethernet MAC is modelled as a fixed-size container/sequence of 6 bytes. A MACAddress can
+        The Ethernet MAC is modeled as a fixed-size container/sequence of 6 bytes. A MACAddress can
         be converted from/to the following representations
 
         <table class="senf">
@@ -112,7 +111,7 @@ namespace senf {
                                              to a MAC address. This conversion is only possible, if
                                              the EUI-64 is MAC compatible: the 4th/5th byte (in
                                              transmission order) must be 0xFFFE.
-                                             \throws AddressSyntaxException if \a v is not a MAC
+                                             \throws AddressSyntaxException if \a eui is not a MAC
                                                  compatible EUI-64. */
 
         bool local() const;             ///< \c true, if address is locally administered
@@ -138,15 +137,18 @@ namespace senf {
      */
     std::istream & operator>>(std::istream & os, MACAddress & mac);
 
+    bool operator==(MACAddress const & mac, EUI64 const & eui64);
+    bool operator==(EUI64 const & eui64, MACAddress const & mac);
+
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "MACAddress.cci"
 #include "MACAddress.ct"
 //#include "MACAddress.cti"
 #endif
 
-
+\f
 // Local Variables:
 // mode: c++
 // fill-column: 100