X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.cci;h=8bba35d80a0c2c002e80891ea94efe531c980efd;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=5c73fe2f8b2eba6392f4a7cd7095cf500108b246;hpb=c74546060360ac6a739a2f2878c72e21e9135390;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.cci b/senf/Socket/Protocols/Raw/MACAddress.cci
index 5c73fe2..8bba35d 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.cci
+++ b/senf/Socket/Protocols/Raw/MACAddress.cci
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief MACAddress inline non-template implementation */
@@ -29,9 +34,9 @@
 #include "EUI64.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::MACAddress
 
 prefix_ senf::MACAddress::MACAddress()
@@ -124,20 +129,16 @@ prefix_ boost::uint64_t senf::MACAddress::uint64()
 prefix_ bool senf::operator==(MACAddress const & mac, EUI64 const & eui64)
 {
     return eui64.isMACCompatible()
-        && eui64[0] == mac[0]
-        && eui64[1] == mac[1]
-        && eui64[2] == mac[2]
-        && eui64[5] == mac[3]
-        && eui64[6] == mac[4]
-        && eui64[7] == mac[5];
+        && std::equal(eui64.begin(), eui64.begin()+3, mac.begin())
+        && std::equal(eui64.begin()+5, eui64.end(), mac.begin()+3);
 }
 
 prefix_ bool senf::operator==(EUI64 const & eui64, MACAddress const & mac)
 {
-    return mac==eui64;
+    return mac == eui64;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_