diff options
| author | Stephen D. Huston <shuston@apache.org> | 2013-06-06 17:17:05 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2013-06-06 17:17:05 +0000 |
| commit | 6d15ba2863d4551aef56e89ca0b08fba7af68608 (patch) | |
| tree | dacf0976de1a8af4fb75dc3064d60e2c89604f65 /qpid/cpp/src/qmf | |
| parent | dc1cb2220c2c5e5102934c58bc8cf71242ddd53a (diff) | |
| download | qpid-python-6d15ba2863d4551aef56e89ca0b08fba7af68608.tar.gz | |
Allows QMF to build on Windows; resolves QPID-4909.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1490363 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qmf')
| -rw-r--r-- | qpid/cpp/src/qmf/Agent.cpp | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/qmf/AgentSession.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp index 684f8e4fba..fa3987e0c9 100644 --- a/qpid/cpp/src/qmf/Agent.cpp +++ b/qpid/cpp/src/qmf/Agent.cpp @@ -220,7 +220,7 @@ uint32_t AgentImpl::getPackageCount() const // // 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(const string& pname) const { 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 string& pname, uint32_t idx) const { 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; diff --git a/qpid/cpp/src/qmf/AgentSession.cpp b/qpid/cpp/src/qmf/AgentSession.cpp index 4d7be33188..1afdc14021 100644 --- a/qpid/cpp/src/qmf/AgentSession.cpp +++ b/qpid/cpp/src/qmf/AgentSession.cpp @@ -375,7 +375,7 @@ void AgentSessionImpl::authAccept(AgentEvent& authEvent) 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::handleV1SchemaRequest(qpid::management::Buffer& buffer, u 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); |