Changeset 23:e6c4c31ce833 in xplcommon for src/xplcommon/win32/StreamBuffer.h

Timestamp:

01/02/13 06:50:19 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Eliminated the double storage of the Overlappable instances in the children of Completer

File:

• src/xplcommon/win32/StreamBuffer.h (modified) (4 diffs)

src/xplcommon/win32/StreamBuffer.h

@@ -52 +52 @@
 protected:
     /**
-     * The buffered stream this stream buffer belongs to.
-     */
-    BufferedStream& stream;
-
-protected:
-    /**
      * Construct the stream buffer with the given capacity and for the
      * given stream.
      */
     StreamBuffer(size_t capacity, BufferedStream* stream);
+
+    /**
+     * Get the stream.
+     *
+     * This just casts the overlappable of the Completer part knowing
+     * that it must be a BufferedStream
+     */
+    BufferedStream& getStream() const;
 
 private:
@@ -83 +85 @@
 inline StreamBuffer::StreamBuffer(size_t capacity, BufferedStream* stream) :
     Buffer(capacity),
-    Completer(stream),
-    stream(*stream)
+    Completer(stream)
 {
+}
+
+//------------------------------------------------------------------------------
+
+inline BufferedStream& StreamBuffer::getStream() const
+{
+    return static_cast<BufferedStream&>(overlappable);
 }
 
@@ -92 +100 @@
 inline const ::xplcommon::Failable& StreamBuffer::getFailable() const
 {
-    return stream;
+    return overlappable;
 }
 
@@ -99 +107 @@
 inline ::xplcommon::Failable& StreamBuffer::getFailable()
 {
-    return stream;
+    return overlappable;
 }