Changeset 16:d70b0c40fe4a in xplcommon for src/xplcommon/posix/StreamBuffer.h

Timestamp:

12/29/12 10:24:28 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Renamed BufferedWaitable to BufferedStream

File:

• src/xplcommon/posix/StreamBuffer.h (moved) (moved from src/xplcommon/posix/WaitableBuffer.h ) (8 diffs)

src/xplcommon/posix/StreamBuffer.h

@@ -28 +28 @@
 // either expressed or implied, of the FreeBSD Project.
 
-#ifndef XPLCOMMON_POSIX_WAITABLEBUFFER_H
-#define XPLCOMMON_POSIX_WAITABLEBUFFER_H
+#ifndef XPLCOMMON_POSIX_STREAMBUFFER_H
+#define XPLCOMMON_POSIX_STREAMBUFFER_H
 //------------------------------------------------------------------------------
 
@@ -35 +35 @@
 #include "../Failable.h"
 
-#include "BufferedWaitable.h"
+#include "BufferedStream.h"
 
 //------------------------------------------------------------------------------
@@ -44 +44 @@
 
 /**
- * Base class for buffers used by a BufferedWaitable.
+ * Base class for buffers used by a BufferedStream.
  */
-class WaitableBuffer : public ::xplcommon::Buffer,
-                       public ::xplcommon::FailableReference<WaitableBuffer>
+class StreamBuffer : public ::xplcommon::Buffer,
+                     public ::xplcommon::FailableReference<StreamBuffer>
 {
 protected:
     /**
-     * Our waitable.
+     * Our buffered stream.
      */
-    BufferedWaitable& waitable;
+    BufferedStream& stream;
 
 protected:
@@ -59 +59 @@
      * Construct the buffer with the given waitable.
      */
-    WaitableBuffer(size_t capacity, BufferedWaitable* waitable);
+    StreamBuffer(size_t capacity, BufferedStream* stream);
 
 private:
@@ -72 +72 @@
     ::xplcommon::Failable& getFailable();
 
-    friend class FailableReference<WaitableBuffer>;
+    friend class FailableReference<StreamBuffer>;
 };
 
@@ -79 +79 @@
 //------------------------------------------------------------------------------
 
-inline WaitableBuffer::WaitableBuffer(size_t capacity,
-                                      BufferedWaitable* waitable) :
+inline StreamBuffer::StreamBuffer(size_t capacity, BufferedStream* stream) :
     Buffer(capacity),
-    waitable(*waitable)
+    stream(*stream)
 {
 }
@@ -88 +87 @@
 //------------------------------------------------------------------------------
 
-inline const ::xplcommon::Failable& WaitableBuffer::getFailable() const
+inline const ::xplcommon::Failable& StreamBuffer::getFailable() const
 {
-    return waitable;
+    return stream;
 }
 
 //------------------------------------------------------------------------------
 
-inline ::xplcommon::Failable& WaitableBuffer::getFailable()
+inline ::xplcommon::Failable& StreamBuffer::getFailable()
 {
-    return waitable;
+    return stream;
 }
 
@@ -105 +104 @@
 
 //------------------------------------------------------------------------------
-#endif // XPLCOMMON_POSIX_WAITABLEBUFFER_H
+#endif // XPLCOMMON_POSIX_STREAMBUFFER_H
 
 // Local Variables: