switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Socket / Protocols / INet / INetAddressing.hh

diff --git a/senf/Socket/Protocols/INet/INetAddressing.hh b/senf/Socket/Protocols/INet/INetAddressing.hh
index 47735a9..458e105 100644 (file)
--- a/senf/Socket/Protocols/INet/INetAddressing.hh
+++ b/senf/Socket/Protocols/INet/INetAddressing.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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 INet[46]Address and INet[46]AddressingPolicy public header
@@ -29,18 +34,14 @@
 
 // Custom includes
 #include <string>
-#include <exception>
 #include <netinet/in.h>
-#include <senf/Socket/SocketPolicy.hh>
-#include <senf/Socket/ClientSocketHandle.hh>
-#include <senf/Socket/CommunicationPolicy.hh>
 #include <senf/Socket/Protocols/BSDAddressingPolicy.hh>
 #include <senf/Socket/Protocols/BSDSocketAddress.hh>
 #include "INet4Address.hh"
 #include "INet6Address.hh"
 
 //#include "INetAddressing.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -60,9 +61,9 @@ namespace senf {
     public:
         static short const addressFamily = AF_INET;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         INet4SocketAddress();
         explicit INet4SocketAddress(std::string const & addr); ///< Set address and port
@@ -88,8 +89,8 @@ namespace senf {
         INet4SocketAddress(const INet4SocketAddress& other);
         INet4SocketAddress& operator=(const INet4SocketAddress& other);
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         INet4Address address() const;   ///< Return address
         unsigned port() const;          ///< Return port number
@@ -148,9 +149,9 @@ namespace senf {
     public:
         static short const addressFamily = AF_INET6;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         INet6SocketAddress();           ///< Create empty instance
         explicit INet6SocketAddress(std::string const & addr,
@@ -178,8 +179,8 @@ namespace senf {
         INet6SocketAddress(const INet6SocketAddress& other);
         INet6SocketAddress& operator=(const INet6SocketAddress& other);
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         INet6Address address() const;    ///< Get printable address representation
         void address(INet6Address const & addr); ///< Change address
@@ -210,7 +211,7 @@ namespace senf {
     std::istream & operator>>(std::istream & is, INet6SocketAddress & addr);
 
     /// \addtogroup policy_impl_group
-    /// @{
+    //\{
 
     /** \brief Addressing policy supporting IPv4 addressing
 
@@ -260,11 +261,11 @@ namespace senf {
         using BSDAddressingPolicyMixin<INet6SocketAddress>::bind;
     };
 
-    /// @}
+    //\}
 
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "INetAddressing.cci"
 //#include "INetAddressing.ct"
 //#include "INetAddressing.cti"