You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/01/08 00:08:13 UTC
svn commit: r732551 - in /qpid/trunk/qpid/cpp/src/qpid: client/Sasl.h
sys/windows/IocpPoller.cpp
Author: shuston
Date: Wed Jan 7 15:08:13 2009
New Revision: 732551
URL: http://svn.apache.org/viewvc?rev=732551&view=rev
Log:
Adapt to recent changes/additions
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/Sasl.h
qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Sasl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Sasl.h?rev=732551&r1=732550&r2=732551&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Sasl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Sasl.h Wed Jan 7 15:08:13 2009
@@ -24,6 +24,7 @@
#include <memory>
#include <string>
+#include "qpid/sys/IntegerTypes.h"
namespace qpid {
@@ -33,7 +34,7 @@
namespace client {
-class ConnectionSettings;
+struct ConnectionSettings;
/**
* Interface to SASL support
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp?rev=732551&r1=732550&r2=732551&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp Wed Jan 7 15:08:13 2009
@@ -21,6 +21,7 @@
#include "qpid/sys/Poller.h"
#include "qpid/sys/Mutex.h"
+#include "qpid/sys/Dispatcher.h"
#include "AsynchIoResult.h"
#include "IoHandlePrivate.h"
@@ -88,6 +89,24 @@
}
};
+void Poller::shutdown() {
+ // Allow sloppy code to shut us down more than once.
+ if (impl->isShutdown)
+ return;
+ ULONG_PTR key = 1; // Tell wait() it's a shutdown, not I/O
+ PostQueuedCompletionStatus(impl->iocp, 0, key, 0);
+}
+
+bool Poller::interrupt(PollerHandle&) {
+ return false; // There's no concept of a registered handle.
+}
+
+void Poller::run() {
+ Poller::shared_ptr p(this);
+ qpid::sys::Dispatcher d(p);
+ d.run();
+}
+
void Poller::addFd(PollerHandle& handle, Direction dir) {
HANDLE h = (HANDLE)(handle.impl->fd);
if (h != INVALID_HANDLE_VALUE) {
@@ -100,14 +119,6 @@
}
}
-void Poller::shutdown() {
- // Allow sloppy code to shut us down more than once.
- if (impl->isShutdown)
- return;
- ULONG_PTR key = 1; // Tell wait() it's a shutdown, not I/O
- PostQueuedCompletionStatus(impl->iocp, 0, key, 0);
-}
-
// All no-ops...
void Poller::delFd(PollerHandle& handle) {}
void Poller::modFd(PollerHandle& handle, Direction dir) {}