X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FSocketHandle.cti;h=fd7e290221fe09da84377b5c6b7ad91f60a081c3;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=ff93a02936274442f0a201f3684a98e8533032a2;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Socket/SocketHandle.cti b/senf/Socket/SocketHandle.cti
index ff93a02..fd7e290 100644
--- a/senf/Socket/SocketHandle.cti
+++ b/senf/Socket/SocketHandle.cti
@@ -32,9 +32,9 @@
 #include <senf/Utils/TypeInfo.hh>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SocketHandle<SPolicy>
 
 template <class SPolicy>
@@ -44,7 +44,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 +67,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 +84,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 +128,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 +205,7 @@ prefix_ Facet & senf::SocketHandle<SPolicy>::facet()
     SENF_WRAP_EXC(std::bad_cast)
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ProtocolSocketBody<SProtocol>
 
 template <class SProtocol>
@@ -214,7 +218,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 +227,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<SPolicy>
     return os;
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_