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;
 }