Utils/RestrictedInt: export Base and Tag template types

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

diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc
index 8021839..46eb7aa 100644 (file)
--- a/senf/Socket/Protocols/Raw/MACAddress.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.cc
@@ -28,8 +28,6 @@
 
 // Custom includes
 #include <iomanip>
-#include <string>
-#include <sstream>
 #include <boost/io/ios_state.hpp>
 #include <senf/Socket/Protocols/AddressExceptions.hh>
 #include "ParseString.hh"
@@ -37,12 +35,12 @@
 
 //#include "MACAddress.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::MACAddress
 
-prefix_ senf::MACAddress::MACAddress senf::MACAddress::from_string(std::string const & s)
+prefix_ senf::MACAddress senf::MACAddress::from_string(std::string const & s)
 {
     MACAddress mac (senf::noinit);
     detail::parseHexString(s, ":-", mac.begin(), mac.end());
@@ -52,7 +50,7 @@ prefix_ senf::MACAddress::MACAddress senf::MACAddress::from_string(std::string c
 prefix_ senf::MACAddress senf::MACAddress::from_eui64(senf::EUI64 const & eui)
 {
     if (eui[3] != 0xffu || eui[4] != 0xfeu)
-        throw AddressSyntaxException();
+        throw AddressSyntaxException() << ": EUI64 is not MAC compatible: " << eui;
     MACAddress mac (senf::noinit);
     mac[0] = eui[0];
     mac[1] = eui[1];
@@ -67,7 +65,7 @@ senf::MACAddress const senf::MACAddress::Broadcast = senf::MACAddress(0xFFFFFFFF
 senf::MACAddress const senf::MACAddress::None;
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace members
 
 prefix_ std::ostream & senf::operator<<(std::ostream & os, MACAddress const & mac)
@@ -96,7 +94,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, MACAddress & mac)
     return is;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "MACAddress.mpp"