Changeset 3:e4ca2e057cec in xplcommon for src/xplcommon/posix/Waitable.h

Timestamp:

12/27/12 13:01:22 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reorganized the code a bit

File:

• src/xplcommon/posix/Waitable.h (moved) (moved from src/xplcommon/POSIXWaitable.h ) (5 diffs)

src/xplcommon/posix/Waitable.h

@@ -28 +28 @@
 // either expressed or implied, of the FreeBSD Project.
 
-#ifndef XPLCOMMON_POSIXWAITABLE_H
-#define XPLCOMMON_POSIXWAITABLE_H
+#ifndef XPLCOMMON_POSIX_WAITABLE_H
+#define XPLCOMMON_POSIX_WAITABLE_H
 //------------------------------------------------------------------------------
 
-#include "config.h"
-
-#ifdef HAVE_POLL_H
+namespace xplcommon { namespace posix {
 
 //------------------------------------------------------------------------------
 
-namespace xplcommon {
-
-//------------------------------------------------------------------------------
-
-class POSIXWaiter;
+class Waiter;
 
 //------------------------------------------------------------------------------
 
 /**
- * Base class of objects for which one can wait in a POSIXWaiter.
+ * Base class of objects for which one can wait in a Waiter.
  *
  * It is basically a file descriptor.
  */
-class POSIXWaitable
+class Waitable
 {
 protected:
@@ -57 +51 @@
      * The waiter this waitable belongs to, if any.
      */
-    POSIXWaiter* waiter;
+    Waiter* waiter;
 
     /**
@@ -73 +67 @@
      * Construct the waitable.
      */
-    POSIXWaitable(POSIXWaiter* waiter, int fd = -1, short events = 0);
+    Waitable(Waiter* waiter, int fd = -1, short events = 0);
 
 public:
@@ -79 +73 @@
      * Destroy the waitable. It will be removed from the waiter.
      */
-    virtual ~POSIXWaitable();
+    virtual ~Waitable();
 
     /**
@@ -96 +90 @@
     virtual void handleEvents(short events) = 0;
 
-    friend class POSIXWaiter;
+    friend class Waiter;
 };
 
 //------------------------------------------------------------------------------
 
-typedef POSIXWaitable Waitable;
+} /* namespace xplcommon::posix */ } /* namespace xplcommon */
 
 //------------------------------------------------------------------------------
-
-} /* namespace xplcommon */
-
-//------------------------------------------------------------------------------
-#endif // HAVE_POLL_H
-
 #endif // XPLCOMMON_POSIXWAITABLE_H