Author: astitcher
Date: Thu Jan 21 18:24:04 2010
New Revision: 901816
URL: http://svn.apache.org/viewvc?rev=901816&view=rev
Log:
Fixes to make Win32 port build again (and remove some warnings)
Modified:
qpid/trunk/qpid/cpp/include/qmf/engine/Event.h
qpid/trunk/qpid/cpp/src/qpid/sys/ClusterSafe.h
qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
Modified: qpid/trunk/qpid/cpp/include/qmf/engine/Event.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/engine/Event.h?rev=901816&r1=901815&r2=901816&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/engine/Event.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/engine/Event.h Thu Jan 21 18:24:04 2010
@@ -38,7 +38,7 @@
private:
friend struct EventImpl;
- friend struct AgentImpl;
+ friend class AgentImpl;
Event(EventImpl* impl);
EventImpl* impl;
};
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ClusterSafe.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ClusterSafe.h?rev=901816&r1=901815&r2=901816&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ClusterSafe.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ClusterSafe.h Thu Jan 21 18:24:04 2010
@@ -22,6 +22,8 @@
*
*/
+#include "qpid/CommonImportExport.h"
+
namespace qpid {
namespace sys {
@@ -37,7 +39,7 @@
* 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
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=901816&r1=901815&r2=901816&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp Thu Jan 21 18:24:04
2010
@@ -194,7 +194,7 @@
{
}
-AsynchConnector::start(Poller::shared_ptr)
+void AsynchConnector::start(Poller::shared_ptr)
{
try {
socket.connect(hostname, port);
@@ -217,14 +217,12 @@
}
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,
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
