Utils/Console: Add SENF_CONSOLE_REGISTER_ENUM 'key()' support

[senf.git] / senf / Socket / FileHandle.cci

diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci
index f5fc5de..83dd47e 100644 (file)
--- a/senf/Socket/FileHandle.cci
+++ b/senf/Socket/FileHandle.cci
@@ -29,7 +29,6 @@
 // Custom includes
 #include <senf/Utils/senfassert.hh>
 #include <errno.h>
-#include <senf/Utils/Exception.hh>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -78,7 +77,7 @@ prefix_ bool senf::FileBody::readable()
 prefix_ bool senf::FileBody::waitReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
+    return pollCheck(fd(), true,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
@@ -91,7 +90,7 @@ prefix_ bool senf::FileBody::writeable()
 prefix_ bool senf::FileBody::waitWriteable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), false, 
+    return pollCheck(fd(), false,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
@@ -104,7 +103,7 @@ prefix_ bool senf::FileBody::oobReadable()
 prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
+    return pollCheck(fd(), true,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)), true);
 }
 
@@ -113,14 +112,14 @@ prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type time
 
 prefix_ senf::FileBody & senf::FileHandle::body()
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }
 
 prefix_ senf::FileBody const & senf::FileHandle::body()
     const
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }