X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.cc;h=dcc4e7e7a4767ecaa9bdb853dd32df6fcea796a7;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=b992ce89c8b454e82f2de1107bcb512ecd717776;hpb=5bd0f0d58ba30d95a02b46fc9122a7e981bcbcad;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc
index b992ce8..dcc4e7e 100644
--- 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() << "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];
@@ -67,13 +65,13 @@ 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)
 {
     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 << ':';
@@ -96,7 +94,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, MACAddress & mac)
     return is;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "MACAddress.mpp"