X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FSocketHandle.cti;h=b2d9f7c546c8db7ffbd39ec9c000caf5eadc550f;hb=aeb7c57c3b42e83cb0b429989f9c3ab0900a76a4;hp=bc3f7be935f228a9256f9f7458af3bc6e7adcc88;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/SocketHandle.cti b/senf/Socket/SocketHandle.cti
index bc3f7be..b2d9f7c 100644
--- a/senf/Socket/SocketHandle.cti
+++ b/senf/Socket/SocketHandle.cti
@@ -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 template implementation
@@ -28,13 +33,13 @@
 
 // Custom includes
 #include <typeinfo>
-#include "../Utils/senfassert.hh"
-#include "../Utils/TypeInfo.hh"
+#include <senf/Utils/senfassert.hh>
+#include <senf/Utils/TypeInfo.hh>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SocketHandle<SPolicy>
 
 template <class SPolicy>
@@ -44,7 +49,7 @@ prefix_ senf::SocketHandle<SPolicy>::SocketHandle()
 template <class SPolicy>
 template <class OtherPolicy>
 prefix_ senf::SocketHandle<SPolicy>::SocketHandle(SocketHandle<OtherPolicy> other,
-                                                              typename IsCompatible<OtherPolicy>::type *)
+                                                  typename IsCompatible<OtherPolicy>::type *)
     : FileHandle(other)
 {}
 
@@ -67,14 +72,16 @@ template <class SPolicy>
 prefix_ senf::SocketHandle<SPolicy>::SocketHandle(FileHandle other, bool isChecked)
     : FileHandle(other)
 {
-    SENF_ASSERT( isChecked );
-    SENF_ASSERT( ! valid() || dynamic_cast<SocketBody *>(&FileHandle::body()) );
+    SENF_ASSERT( isChecked, "Internal failure: Wrong overload called !!" );
+    SENF_ASSERT( ! valid() || dynamic_cast<SocketBody *>(&FileHandle::body()),
+                 "Internal failure: Replacing or re-assigning non-empty incompatible handle");
 }
 
 template <class SPolicy>
 prefix_ senf::SocketBody & senf::SocketHandle<SPolicy>::body()
 {
-    SENF_ASSERT( dynamic_cast<SocketBody *>(&FileHandle::body()) );
+    SENF_ASSERT( dynamic_cast<SocketBody *>(&FileHandle::body()),
+                 "Internal failure: Invalid body found it's way into SocketHandle");
     return static_cast<SocketBody &>(FileHandle::body());
 }
 
@@ -82,7 +89,8 @@ template <class SPolicy>
 prefix_ senf::SocketBody const & senf::SocketHandle<SPolicy>::body()
     const
 {
-    SENF_ASSERT( dynamic_cast<SocketBody const *>(&FileHandle::body()) );
+    SENF_ASSERT( dynamic_cast<SocketBody const *>(&FileHandle::body()),
+                 "Internal failure: Invalid body found it's way into SocketHandle");
     return static_cast<SocketBody const &>(FileHandle::body());
 }
 
@@ -125,7 +133,8 @@ prefix_ Target senf::static_socket_cast(Source handle)
         boost::is_convertible<Target*,FileHandle*>::value &&
         ( boost::is_convertible<Source,Target>::value ||
           boost::is_convertible<Target,Source>::value ) ));
-    SENF_ASSERT( check_socket_cast<Target>(handle) );
+    SENF_ASSERT( check_socket_cast<Target>(handle),
+                 "Invalid static_socket_cast" );
     return Target::cast_static(handle);
 }
 
@@ -201,7 +210,7 @@ prefix_ Facet & senf::SocketHandle<SPolicy>::facet()
     SENF_WRAP_EXC(std::bad_cast)
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ProtocolSocketBody<SProtocol>
 
 template <class SProtocol>
@@ -214,7 +223,7 @@ prefix_ senf::ProtocolSocketBody<SProtocol>::ProtocolSocketBody(bool isServer, i
     : SocketBody(isServer, fd)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 template <class SPolicy>
 prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<SPolicy> handle)
@@ -223,7 +232,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<SPolicy>
     return os;
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_