Author: shuston
Date: Thu Jun 6 17:17:05 2013
New Revision: 1490363
URL: http://svn.apache.org/r1490363
Log:
Allows QMF to build on Windows; resolves QPID-4909.
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1490363&r1=1490362&r2=1490363&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Jun 6 17:17:05 2013
@@ -1322,7 +1322,16 @@ install (FILES ${qmf_HEADERS}
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf ${QPID_COMPONENT_QMF})
-if(NOT WIN32)
+if (NOT WIN32)
+ set (qmf2_platform_headers
+ ../include/qmf/posix/EventNotifier.h
+ )
+ set (qmf2_platform_sources
+ qmf/PosixEventNotifier.cpp
+ qmf/PosixEventNotifierImpl.cpp
+ )
+endif (NOT WIN32)
+
set (qmf2_HEADERS
../include/qmf/AgentEvent.h
../include/qmf/Agent.h
@@ -1334,7 +1343,6 @@ if(NOT WIN32)
../include/qmf/exceptions.h
../include/qmf/Handle.h
../include/qmf/ImportExport.h
- ../include/qmf/posix/EventNotifier.h
../include/qmf/Query.h
../include/qmf/Schema.h
../include/qmf/SchemaId.h
@@ -1342,6 +1350,7 @@ if(NOT WIN32)
../include/qmf/SchemaProperty.h
../include/qmf/SchemaTypes.h
../include/qmf/Subscription.h
+ ${qmf2_platform_headers}
)
set (qmf2_SOURCES
@@ -1366,8 +1375,6 @@ if(NOT WIN32)
qmf/DataImpl.h
qmf/EventNotifierImpl.h
qmf/EventNotifierImpl.cpp
- qmf/PosixEventNotifier.cpp
- qmf/PosixEventNotifierImpl.cpp
qmf/exceptions.cpp
qmf/Expression.cpp
qmf/Expression.h
@@ -1388,6 +1395,7 @@ if(NOT WIN32)
qmf/SchemaPropertyImpl.h
qmf/Subscription.cpp
qmf/SubscriptionImpl.h
+ ${qmf2_platform_sources}
)
add_msvc_version (qmf2 library dll)
@@ -1403,7 +1411,6 @@ if(NOT WIN32)
DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf2 ${QPID_COMPONENT_QMF})
-endif (NOT WIN32)
set (qmfengine_SOURCES
qmf/engine/Agent.cpp
Modified: qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Agent.cpp?rev=1490363&r1=1490362&r2=1490363&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Agent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Agent.cpp Thu Jun 6 17:17:05 2013
@@ -220,7 +220,7 @@ uint32_t AgentImpl::getPackageCount() co
//
// Populate the package set.
//
- for (set<SchemaId>::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++)
+ for (set<SchemaId, SchemaIdCompare>::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++)
packageSet.insert(iter->getPackageName());
return packageSet.size();
@@ -244,7 +244,7 @@ uint32_t AgentImpl::getSchemaIdCount(con
{
qpid::sys::Mutex::ScopedLock l(lock);
uint32_t count(0);
- for (set<SchemaId>::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++)
+ for (set<SchemaId, SchemaIdCompare>::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++)
if (iter->getPackageName() == pname)
count++;
return count;
@@ -255,7 +255,7 @@ SchemaId AgentImpl::getSchemaId(const st
{
qpid::sys::Mutex::ScopedLock l(lock);
uint32_t count(0);
- for (set<SchemaId>::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++) {
+ for (set<SchemaId, SchemaIdCompare>::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++) {
if (iter->getPackageName() == pname) {
if (idx == count)
return *iter;
Modified: qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp?rev=1490363&r1=1490362&r2=1490363&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp Thu Jun 6 17:17:05 2013
@@ -375,7 +375,7 @@ void AgentSessionImpl::authAccept(AgentE
if (query.getSchemaId().isValid()) {
{
qpid::sys::Mutex::ScopedLock l(lock);
- map<SchemaId, DataIndex>::const_iterator iter =
schemaIndex.find(query.getSchemaId());
+ map<SchemaId, DataIndex, SchemaIdCompareNoHash>::const_iterator
iter = schemaIndex.find(query.getSchemaId());
if (iter != schemaIndex.end())
for (DataIndex::const_iterator dIter = iter->second.begin();
dIter != iter->second.end(); dIter++)
if (query.matchesPredicate(dIter->second.getProperties()))
@@ -751,7 +751,7 @@ void AgentSessionImpl::handleV1SchemaReq
QPID_LOG(trace, "RCVD QMFv1 SchemaRequest for " << packageName << ":" <<
className);
qpid::types::Uuid hash(hashBits);
- map<SchemaId, Schema>::const_iterator iter;
+ map<SchemaId, Schema, SchemaIdCompare>::const_iterator iter;
string replyContent;
SchemaId dataId(SCHEMA_TYPE_DATA, packageName, className);
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h?rev=1490363&r1=1490362&r2=1490363&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h Thu Jun 6 17:17:05
2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/messaging/ImportExport.h"
#include "qpid/messaging/Address.h"
namespace qpid {
@@ -29,10 +30,10 @@ namespace messaging {
class AddressParser
{
public:
- AddressParser(const std::string&);
+ QPID_MESSAGING_EXTERN AddressParser(const std::string&);
bool parse(Address& address);
- bool parseMap(qpid::types::Variant::Map& map);
- bool parseList(qpid::types::Variant::List& list);
+ QPID_MESSAGING_EXTERN bool parseMap(qpid::types::Variant::Map& map);
+ QPID_MESSAGING_EXTERN bool parseList(qpid::types::Variant::List& list);
private:
const std::string& input;
std::string::size_type current;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
