Changeset 25:fe70f0063cae in xplcommon

Timestamp:

01/02/13 07:47:31 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 2 'hg:/home/ivaradi/xplane/hg/xplcommon' '/'>, 'public')

Message:

Moved releaseHandle to Overlappable

Location:

src/xplcommon/win32

Files:

• LocalAcceptor.h (modified) (2 diffs)
• LocalServerSocketBase.cc (modified) (1 diff)
• LocalServerSocketBase.h (modified) (1 diff)
• Overlappable.h (modified) (2 diffs)

src/xplcommon/win32/LocalAcceptor.h

@@ -133 +133 @@
     if (!accepted) return 0;
 
-    LocalSocket* s = new LocalSocket(waiter, getServerSocket().releaseHandle(),
+    LocalSocket* s = new LocalSocket(waiter, overlappable.releaseHandle(),
                                      readingCapacity, writingCapacity);
     accepted = false;
@@ -144 +144 @@
                                              size_t writingCapacity)
 {
-    return getSocket(getServerSocket().waiter,
+    return getSocket(overlappable.getWaiter(),
                      readingCapacity, writingCapacity);
 }

src/xplcommon/win32/LocalServerSocketBase.cc

@@ -69 +69 @@
 //------------------------------------------------------------------------------
 
-HANDLE LocalServerSocketBase::releaseHandle()
-{
-    HANDLE h = handle;
-    handle = 0;
-    return h;
-}
-
-//------------------------------------------------------------------------------
-
 // Local Variables:
 // mode: C++

src/xplcommon/win32/LocalServerSocketBase.h

@@ -76 +76 @@
     bool connectNamedPipe(Overlapped* overlapped);
 
-    /**
-     * Get the handle and clear it.
-     */
-    HANDLE releaseHandle();
-
     friend class LocalAcceptor;
 };

src/xplcommon/win32/Overlappable.h

@@ -86 +86 @@
     bool hasWaiter() const;
 
+    /**
+     * Get the handle and clear it.
+     */
+    HANDLE releaseHandle();
+
     friend class Completer;
 };
@@ -122 +127 @@
 //------------------------------------------------------------------------------
 
+inline HANDLE Overlappable::releaseHandle()
+{
+    HANDLE h = handle;
+    handle = 0;
+    return h;
+}
+
+//------------------------------------------------------------------------------
+
 } /* namespace xplcommon::win32 */ } /* namespace xplcommon */