Changeset 24:efa33e16e135 in xplcommon

Timestamp:

01/02/13 06:53:35 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Made Completer a FailableReference

Location:

src/xplcommon/win32

Files:

• Completer.h (modified) (4 diffs)
• LocalAcceptor.h (modified) (3 diffs)
• StreamBuffer.h (modified) (3 diffs)

src/xplcommon/win32/Completer.h

@@ -32 +32 @@
 //------------------------------------------------------------------------------
 
+#include "../Failable.h"
+
 #include "Overlapped.h"
 #include "Overlappable.h"
@@ -47 +49 @@
  * object is created and stored in this object.
  */
-class Completer
+class Completer : public ::xplcommon::FailableReference<Completer>
 {
 protected:
@@ -110 +112 @@
      */
     virtual void handleWaitedResult(DWORD size) = 0;
+
+private:
+    /**
+     * Get the failable object.
+     */
+    const ::xplcommon::Failable& getFailable() const;
+
+    /**
+     * Get the failable object.
+     */
+    ::xplcommon::Failable& getFailable();
+
+    friend class FailableReference<Completer>;
 };
 
@@ -180 +195 @@
 //------------------------------------------------------------------------------
 
+inline const ::xplcommon::Failable& Completer::getFailable() const
+{
+    return overlappable;
+}
+
+//------------------------------------------------------------------------------
+
+inline ::xplcommon::Failable& Completer::getFailable()
+{
+    return overlappable;
+}
+
+//------------------------------------------------------------------------------
+
 } /* namespace xplcommon::win32 */ } /* namespace xplcommon */
 

src/xplcommon/win32/LocalAcceptor.h

@@ -47 +47 @@
  * local server socket, i.e. named pipe.
  */
-class LocalAcceptor : public Completer,
-                      public FailableReference<LocalAcceptor>
+class LocalAcceptor : public Completer
 {
 private:
@@ -114 +113 @@
     virtual void handleWaitedResult(DWORD size);
 
-private:
-    /**
-     * Get the failable object.
-     */
-    const ::xplcommon::Failable& getFailable() const;
-
-    /**
-     * Get the failable object.
-     */
-    ::xplcommon::Failable& getFailable();
-
-    friend class FailableReference<LocalAcceptor>;
     friend class LocalServerSocket;
 };
@@ -163 +150 @@
 //------------------------------------------------------------------------------
 
-inline const ::xplcommon::Failable& LocalAcceptor::getFailable() const
-{
-    return overlappable;
-}
-
-//------------------------------------------------------------------------------
-
-inline ::xplcommon::Failable& LocalAcceptor::getFailable()
-{
-    return overlappable;
-}
-
-//------------------------------------------------------------------------------
-
 } /* namespace xplcommon::win32 */ } /* namespace xplcommon */
 

src/xplcommon/win32/StreamBuffer.h

@@ -47 +47 @@
  * Base class for stream reading and writing buffers.
  */
-class StreamBuffer : public ::xplcommon::Buffer, public Completer,
-                     public ::xplcommon::FailableReference<StreamBuffer>
+class StreamBuffer : public ::xplcommon::Buffer, public Completer
 {
 protected:
@@ -64 +63 @@
      */
     BufferedStream& getStream() const;
-
-private:
-    /**
-     * Get the failable object.
-     */
-    const ::xplcommon::Failable& getFailable() const;
-
-    /**
-     * Get the failable object.
-     */
-    ::xplcommon::Failable& getFailable();
-
-    friend class FailableReference<StreamBuffer>;
 };
 
@@ -98 +84 @@
 //------------------------------------------------------------------------------
 
-inline const ::xplcommon::Failable& StreamBuffer::getFailable() const
-{
-    return overlappable;
-}
-
-//------------------------------------------------------------------------------
-
-inline ::xplcommon::Failable& StreamBuffer::getFailable()
-{
-    return overlappable;
-}
-
-//------------------------------------------------------------------------------
-
 } /* namespace xplcommon::win32 */ } /* namespace xplcommon */