diff options
| author | Alan Conway <aconway@apache.org> | 2013-08-02 21:08:22 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-08-02 21:08:22 +0000 |
| commit | e139cb908acc36a6ef0ec86e99db939eb1206fc7 (patch) | |
| tree | d42430b2311c945b068e46be89c7601c52f050ad /cpp/src/qpid/ha/TxReplicator.cpp | |
| parent | 1ee8f335c83557211055bbfbefb17e8781d35e33 (diff) | |
| download | qpid-python-e139cb908acc36a6ef0ec86e99db939eb1206fc7.tar.gz | |
QPID-4327: HA Fix windows compile errors introduced by recent commits.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1509861 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/ha/TxReplicator.cpp')
| -rw-r--r-- | cpp/src/qpid/ha/TxReplicator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/ha/TxReplicator.cpp b/cpp/src/qpid/ha/TxReplicator.cpp index 0a524c8ced..3b53cf9886 100644 --- a/cpp/src/qpid/ha/TxReplicator.cpp +++ b/cpp/src/qpid/ha/TxReplicator.cpp @@ -47,11 +47,11 @@ namespace qpid { namespace ha { using namespace std; -using namespace boost; using namespace qpid::broker; using namespace qpid::framing; using qpid::broker::amqp_0_10::MessageTransfer; using qpid::types::Uuid; +using boost::make_shared; namespace { const string QPID_HA(QPID_HA_PREFIX); @@ -87,7 +87,7 @@ TxReplicator::TxReplicator( logPrefix = "Backup of transaction "+shortId+": "; if (!store) throw Exception(QPID_MSG(logPrefix << "No message store loaded.")); - boost::shared_ptr<Backup> backup = dynamic_pointer_cast<Backup>(hb.getRole()); + boost::shared_ptr<Backup> backup = boost::dynamic_pointer_cast<Backup>(hb.getRole()); if (!backup) throw Exception(QPID_MSG(logPrefix << "Broker is not in backup mode.")); brokerReplicator = backup->getBrokerReplicator(); @@ -195,7 +195,7 @@ void TxReplicator::DequeueState::addRecords(const EventMap::value_type& entry) { boost::shared_ptr<TxAccept> TxReplicator::DequeueState::makeAccept() { for_each(events.begin(), events.end(), boost::bind(&TxReplicator::DequeueState::addRecords, this, _1)); - return make_shared<TxAccept>(cref(recordIds), ref(records)); + return boost::make_shared<TxAccept>(boost::cref(recordIds), boost::ref(records)); } void TxReplicator::prepare(const string&, sys::Mutex::ScopedLock& l) { |
