X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet4Address.cci;h=40024ca1c8ba3e5c33bd53bc5a98c88abfbc24b6;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=5cdc88728a45d9d733220189397221ba98a5298a;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet4Address.cci b/senf/Socket/Protocols/INet/INet4Address.cci
index 5cdc887..40024ca 100644
--- a/senf/Socket/Protocols/INet/INet4Address.cci
+++ b/senf/Socket/Protocols/INet/INet4Address.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 INet4Address inline non-template implementation */
@@ -26,9 +31,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet4Address
 
 prefix_ senf::INet4Address::INet4Address()
@@ -46,13 +51,13 @@ prefix_ senf::INet4Address senf::INet4Address::from_inaddr(inaddr_type v)
 
 prefix_ senf::INet4Address::inaddr_type & senf::INet4Address::iref()
 {
-    return *reinterpret_cast<inaddr_type *>(&(*this)[0]);
+    return *static_cast<inaddr_type *>(static_cast<void *>((&(*this)[0])));
 }
 
 prefix_ senf::INet4Address::inaddr_type senf::INet4Address::iref()
     const
 {
-    return *reinterpret_cast<inaddr_type const *>(&(*this)[0]);
+    return *static_cast<inaddr_type const *>(static_cast<void const *>(&(*this)[0]));
 }
 
 prefix_ senf::INet4Address::inaddr_type senf::INet4Address::inaddr()
@@ -78,7 +83,7 @@ prefix_ bool senf::INet4Address::boolean_test()
     return inaddr();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet4Network
 
 prefix_ unsigned senf::INet4Network::prefix_len()
@@ -87,7 +92,7 @@ prefix_ unsigned senf::INet4Network::prefix_len()
     return prefix_len_;
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 prefix_ boost::uint32_t senf::INet4Network::mask()
@@ -97,7 +102,7 @@ prefix_ boost::uint32_t senf::INet4Network::mask()
     return (~((boost::uint32_t(1u)<<(32u-prefix_len()))-1u)) & 0xFFFFFFFFu;
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // public members
 
 prefix_ senf::INet4Network::INet4Network()
@@ -148,7 +153,7 @@ prefix_ senf::INet4Network senf::INet4Network::subnet(boost::uint32_t net, unsig
     return INet4Network(host(net << (32-prefix_len)),prefix_len);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace members
 
 prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Network const & addr)
@@ -157,10 +162,10 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Network const &
     return os;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100