X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.cc;h=dcc4e7e7a4767ecaa9bdb853dd32df6fcea796a7;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=121b0beba03314338f90f46b189515dbfa7ff08e;hpb=93d9568d448749dc187e7622b733a4a3caa319df;p=senf.git diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc index 121b0be..dcc4e7e 100644 --- a/senf/Socket/Protocols/Raw/MACAddress.cc +++ b/senf/Socket/Protocols/Raw/MACAddress.cc @@ -28,8 +28,6 @@ // Custom includes #include -#include -#include #include #include #include "ParseString.hh" @@ -52,7 +50,7 @@ prefix_ senf::MACAddress senf::MACAddress::from_string(std::string const & s) prefix_ senf::MACAddress senf::MACAddress::from_eui64(senf::EUI64 const & eui) { if (eui[3] != 0xffu || eui[4] != 0xfeu) - throw AddressSyntaxException() << "EUI64 is not MAC compatible: " << eui; + throw AddressSyntaxException() << ": EUI64 is not MAC compatible: " << eui; MACAddress mac (senf::noinit); mac[0] = eui[0]; mac[1] = eui[1]; @@ -73,7 +71,7 @@ senf::MACAddress const senf::MACAddress::None; prefix_ std::ostream & senf::operator<<(std::ostream & os, MACAddress const & mac) { boost::io::ios_all_saver ias (os); - os << std::hex << std::setfill('0'); + os << std::hex << std::setfill('0') << std::right; for (MACAddress::const_iterator i (mac.begin()); i != mac.end(); ++i) { if (i != mac.begin()) os << ':';