X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.ct;h=d66ef9ea4ce01af7f9166a1095b265099e9448e8;hb=HEAD;hp=adcbacabe946ffdc506ad116f29750b22935b696;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.ct b/senf/Socket/Protocols/INet/INet6Address.ct
index adcbaca..d66ef9e 100644
--- a/senf/Socket/Protocols/INet/INet6Address.ct
+++ b/senf/Socket/Protocols/INet/INet6Address.ct
@@ -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 INet6Address non-inline template implementation  */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6Address
 
 template <class InputIterator>
@@ -44,39 +49,39 @@ prefix_ senf::INet6Address senf::INet6Address::from_data(InputIterator i)
     return addr;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace senf::detail members
 
 template <class ForwardIterator, class Function>
 prefix_ void senf::detail::apply_mask(unsigned bits, ForwardIterator b, ForwardIterator e,
                                       Function fn)
 {
-    for(; bits>8 && b != e; bits -= 8, ++b) 
+    for (; bits>8 && b != e; bits -= 8, ++b)
         fn(*b, boost::lambda::make_const(0xFFu));
     if (bits > 0 && b != e)
         fn( *(b++), boost::lambda::make_const(~ low_bits_mask(8-bits)));
-    for(; b != e; ++b)
+    for (; b != e; ++b)
         fn(*b, boost::lambda::make_const(0u));
 }
 
 template <class ForwardIterator1, class ForwardIterator2, class Function>
 prefix_ ForwardIterator1 senf::detail::find_if_mask(unsigned bits, ForwardIterator1 b1,
-                                                    ForwardIterator1 e1, ForwardIterator2 b2, 
+                                                    ForwardIterator1 e1, ForwardIterator2 b2,
                                                     Function fn)
 {
-    for(; bits>8 && b1 != e1; bits -= 8, ++b1, ++b2) 
+    for (; bits>8 && b1 != e1; bits -= 8, ++b1, ++b2)
         if (fn(*b1, *b2, boost::lambda::make_const(0xFFu)))
             return b1;
     if (bits > 0 && b1 != e1)
-        if (fn( *(b1++), *(b2++), boost::lambda::make_const(~ low_bits_mask(8-bits))))
+        if (fn(*b1, *b2, boost::lambda::make_const(~ low_bits_mask(8-bits))))
             return b1;
-    for(; b1 != e1; ++b1, ++b2)
+    for (++b1, ++b2; b1 != e1; ++b1, ++b2)
         if (fn(*b1, *b2, boost::lambda::make_const(0u)))
             return b1;
     return e1;
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_