X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FFileHandle.cci;h=83dd47ed1419550f10c7b59b1bb1ad9459ebbe7d;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=f5fc5de96c43d190507cfc78ba4589d1b1f487de;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci index f5fc5de..83dd47e 100644 --- a/senf/Socket/FileHandle.cci +++ b/senf/Socket/FileHandle.cci @@ -29,7 +29,6 @@ // Custom includes #include #include -#include #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_; }