diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-01-21 18:24:04 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-01-21 18:24:04 +0000 |
| commit | 7009e44fbf44f4053a9067c2228abae0bc2e3ad7 (patch) | |
| tree | b5950f28d9d329206bd780839537241aa6a3447b /cpp | |
| parent | 1aaba52bd281fbc64edad8c857ee6c972ae7796f (diff) | |
| download | qpid-python-7009e44fbf44f4053a9067c2228abae0bc2e3ad7.tar.gz | |
Fixes to make Win32 port build again (and remove some warnings)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901816 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/qmf/engine/Event.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/ClusterSafe.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/windows/AsynchIO.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/qmf/engine/Event.h b/cpp/include/qmf/engine/Event.h index 4e5200a0a8..647b88dbf8 100644 --- a/cpp/include/qmf/engine/Event.h +++ b/cpp/include/qmf/engine/Event.h @@ -38,7 +38,7 @@ namespace engine { private: friend struct EventImpl; - friend struct AgentImpl; + friend class AgentImpl; Event(EventImpl* impl); EventImpl* impl; }; diff --git a/cpp/src/qpid/sys/ClusterSafe.h b/cpp/src/qpid/sys/ClusterSafe.h index 70f07a958a..abb9ad0fff 100644 --- a/cpp/src/qpid/sys/ClusterSafe.h +++ b/cpp/src/qpid/sys/ClusterSafe.h @@ -22,6 +22,8 @@ * */ +#include "qpid/CommonImportExport.h" + namespace qpid { namespace sys { @@ -37,7 +39,7 @@ namespace sys { * This function is in the common library rather than the cluster * library because it is called by code in the broker library. */ -void assertClusterSafe(); +QPID_COMMON_EXTERN void assertClusterSafe(); /** * Base class for classes that encapsulate state which is replicated diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/cpp/src/qpid/sys/windows/AsynchIO.cpp index 745ff187c8..96e7ee57c0 100644 --- a/cpp/src/qpid/sys/windows/AsynchIO.cpp +++ b/cpp/src/qpid/sys/windows/AsynchIO.cpp @@ -194,7 +194,7 @@ AsynchConnector::AsynchConnector(const Socket& sock, { } -AsynchConnector::start(Poller::shared_ptr) +void AsynchConnector::start(Poller::shared_ptr) { try { socket.connect(hostname, port); @@ -217,14 +217,12 @@ AsynchAcceptor* AsynchAcceptor::create(const Socket& s, } AsynchConnector* qpid::sys::AsynchConnector::create(const Socket& s, - Poller::shared_ptr poller, std::string hostname, uint16_t port, ConnectedCallback connCb, FailedCallback failCb) { return new windows::AsynchConnector(s, - poller, hostname, port, connCb, |