X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.ih;h=87b1920ea44d8e86c409c4c02117047b92849f86;hb=294845be2d7bd75cd01d269d7fe4ab498f379d1c;hp=e87e3192b829a8ea618dd5b858df95d0ebe1ce5a;hpb=31243b46fbd06bc6301acca8fbd8153829c61b0a;p=senf.git

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index e87e319..87b1920 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -24,8 +24,8 @@
     \brief FileHandle internal header
  */
 
-#ifndef IH_FileHandle_
-#define IH_FileHandle_ 1
+#ifndef IH_SENF_Socket_FileHandle_
+#define IH_SENF_Socket_FileHandle_ 1
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
@@ -83,10 +83,11 @@ namespace senf {
                                            constructor not some arbitrary id even if you overload
                                            all the virtual members. If the file descriptor is -1 the
                                            resulting body/handle is not valid() */
+        virtual ~FileBody();
 
-        // NO DESTRUCTOR HERE - destructors and virtual functions don't mix. What would be in the
-        // the destructor is in 'destroyClose()' which is called from FileHandle::~FileHandle()
-        // *before* the last handle dies.
+        // NO DESTRUCTOR HERE (that is, only an empty virtual destructor) - destructors and virtual
+        // functions don't mix. What would be in the the destructor is in 'destroyClose()' which is
+        // called from FileHandle::~FileHandle() *before* the last handle dies.
 
         // no copy
         // no conversion constructors
@@ -107,6 +108,8 @@ namespace senf {
         void waitReadable() const;
         bool writeable() const;
         void waitWriteable() const;
+        bool oobReadable() const;
+        void waitOOBReadable() const;
 
         bool blocking() const;
         void blocking(bool status);
@@ -139,7 +142,7 @@ namespace senf {
     protected:
 
     private:
-        bool pollCheck(int fd, bool incoming, bool block=false) const;
+        bool pollCheck(int fd, bool incoming, bool block=false, bool oob=false) const;
 
         int fd_;
     };