diff options
| author | Alan Conway <aconway@apache.org> | 2012-06-14 20:10:13 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-06-14 20:10:13 +0000 |
| commit | ad62a37b0dfbef26943d51233083ef5a5348cb33 (patch) | |
| tree | 707da7ce707b2821d7151a135ce9f3e8197120af /qpid/cpp/src | |
| parent | 0c8ef48c819844bb921ff33ca5196a5705757f7e (diff) | |
| download | qpid-python-ad62a37b0dfbef26943d51233083ef5a5348cb33.tar.gz | |
NO-JIRA: Fix build errors and warnings on windows in HA code.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1350383 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/ha/QueueGuard.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp index 57231032ff..05dfb539be 100644 --- a/qpid/cpp/src/qpid/ha/Primary.cpp +++ b/qpid/cpp/src/qpid/ha/Primary.cpp @@ -73,7 +73,7 @@ Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) : } else { QPID_LOG(debug, logPrefix << "Expected backups: " << expect); - for (BrokerInfo::Set::iterator i = expect.begin(); i != expect.end(); ++i) { + for (BrokerInfo::Set::const_iterator i = expect.begin(); i != expect.end(); ++i) { bool guard = true; // Create queue guards immediately for expected backups. boost::shared_ptr<RemoteBackup> backup( new RemoteBackup(*i, haBroker.getBroker(), haBroker.getReplicationTest(), guard)); diff --git a/qpid/cpp/src/qpid/ha/QueueGuard.h b/qpid/cpp/src/qpid/ha/QueueGuard.h index cf6e39e96c..1f8c117d0b 100644 --- a/qpid/cpp/src/qpid/ha/QueueGuard.h +++ b/qpid/cpp/src/qpid/ha/QueueGuard.h @@ -34,7 +34,7 @@ namespace qpid { namespace broker { class Queue; -class QueuedMessage; +struct QueuedMessage; class Message; } |