X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FSocketHandle.cci;h=faaf4e7a84c33cf1c984360325f8b322ca94d9b5;hb=aeb7c57c3b42e83cb0b429989f9c3ab0900a76a4;hp=984b0a6cb0bde86d1ded458c5fb71498de238208;hpb=b6acba899f44ba9422476022c775cef823fc9337;p=senf.git

diff --git a/senf/Socket/SocketHandle.cci b/senf/Socket/SocketHandle.cci
index 984b0a6..faaf4e7 100644
--- a/senf/Socket/SocketHandle.cci
+++ b/senf/Socket/SocketHandle.cci
@@ -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 SocketHandle inline non-template implementation
@@ -27,11 +32,10 @@
 #include "SocketHandle.ih"
 
 // Custom includes
-#include <senf/Utils/senfassert.hh>
 #include "SocketProtocol.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::SocketBody::SocketBody(bool isServer)
     : isServer_(isServer)
@@ -64,7 +68,7 @@ prefix_ std::auto_ptr<senf::SocketBody> senf::SocketBody::clone(int fd, bool isS
     return protocol().clone(fd, isServer);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::StreamableString
 
 prefix_ senf::detail::StreamableString & senf::detail::StreamableString::operator<<(bool v)
@@ -72,7 +76,7 @@ prefix_ senf::detail::StreamableString & senf::detail::StreamableString::operato
     return (*this) << std::string(v ? "true" : "false");
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_