fixes for g++ 4.5 (some members returned "the constructor, not the type")

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

diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci
index 09628f8..5842237 100644 (file)
--- a/senf/Socket/FileHandle.cci
+++ b/senf/Socket/FileHandle.cci
@@ -31,9 +31,9 @@
 #include <errno.h>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileBody
 
 prefix_ senf::FileBody::FileBody(int fd)
@@ -77,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)) );
 }
 
@@ -90,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)) );
 }
 
@@ -103,23 +103,23 @@ 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);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileHandle
 
 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_;
 }
 
@@ -227,8 +227,7 @@ prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
     return handle.body();
 }
 
-prefix_ senf::FileBody const &
-senf::FileHandle::body(FileHandle const & handle)
+prefix_ senf::FileBody const & senf::FileHandle::body(FileHandle const & handle)
 {
     return handle.body();
 }
@@ -238,14 +237,12 @@ prefix_ void senf::FileHandle::fd(int fd)
     body().fd(fd);
 }
 
-prefix_ senf::FileHandle::FileHandle
-senf::FileHandle::cast_static(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_static(FileHandle handle)
 {
     return handle;
 }
 
-prefix_ senf::FileHandle
-senf::FileHandle::cast_dynamic(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_dynamic(FileHandle handle)
 {
     return handle;
 }
@@ -255,7 +252,7 @@ prefix_ int senf::retrieve_filehandle(FileHandle handle)
     return handle.fd();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f