diff options
author | Alan Conway <aconway@apache.org> | 2013-08-05 16:35:03 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2013-08-05 16:35:03 +0000 |
commit | 96f8d7a0b88250926c27dfe2ef4aedd040af4542 (patch) | |
tree | f09f4e518dfa9369520d4543a230441fb0d868cd | |
parent | fb1a4d4e3fff65179f1dbcd3fc25b127320380ba (diff) | |
download | qpid-python-96f8d7a0b88250926c27dfe2ef4aedd040af4542.tar.gz |
NO-JIRA: Remove use of boost::make_shared, not availble on some older versions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1510596 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | cpp/src/qpid/ha/Primary.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/ha/PrimaryTxObserver.cpp | 4 | ||||
-rw-r--r-- | cpp/src/qpid/ha/TxReplicator.cpp | 5 | ||||
-rw-r--r-- | cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp | 3 | ||||
-rw-r--r-- | cpp/src/tests/TransactionObserverTest.cpp | 4 |
5 files changed, 6 insertions, 12 deletions
diff --git a/cpp/src/qpid/ha/Primary.cpp b/cpp/src/qpid/ha/Primary.cpp index d67761a625..796de0341d 100644 --- a/cpp/src/qpid/ha/Primary.cpp +++ b/cpp/src/qpid/ha/Primary.cpp @@ -39,7 +39,6 @@ #include "qpid/types/Uuid.h" #include "qpid/sys/Timer.h" #include <boost/bind.hpp> -#include <boost/make_shared.hpp> #include <boost/shared_ptr.hpp> namespace qpid { @@ -47,7 +46,6 @@ namespace ha { using sys::Mutex; using boost::shared_ptr; -using boost::make_shared; using namespace std; using namespace framing; diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/cpp/src/qpid/ha/PrimaryTxObserver.cpp index d30fa06caa..96be5e552e 100644 --- a/cpp/src/qpid/ha/PrimaryTxObserver.cpp +++ b/cpp/src/qpid/ha/PrimaryTxObserver.cpp @@ -31,7 +31,6 @@ #include "qpid/broker/Broker.h" #include "qpid/broker/Queue.h" #include <boost/lexical_cast.hpp> -#include <boost/make_shared.hpp> namespace qpid { namespace framing { @@ -101,7 +100,8 @@ PrimaryTxObserver::PrimaryTxObserver(HaBroker& hb) : } void PrimaryTxObserver::initialize() { - broker.getExchanges().registerExchange(boost::make_shared<Exchange>(shared_from_this())); + broker.getExchanges().registerExchange( + boost::shared_ptr<Exchange>(new Exchange(shared_from_this()))); } void PrimaryTxObserver::enqueue(const QueuePtr& q, const broker::Message& m) diff --git a/cpp/src/qpid/ha/TxReplicator.cpp b/cpp/src/qpid/ha/TxReplicator.cpp index 3b53cf9886..2c45752dcc 100644 --- a/cpp/src/qpid/ha/TxReplicator.cpp +++ b/cpp/src/qpid/ha/TxReplicator.cpp @@ -39,7 +39,6 @@ #include "qpid/log/Statement.h" #include <boost/shared_ptr.hpp> #include <boost/bind.hpp> -#include <boost/make_shared.hpp> #include "qpid/broker/amqp_0_10/MessageTransfer.h" #include "qpid/framing/MessageTransferBody.h" @@ -51,7 +50,6 @@ 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); @@ -195,7 +193,8 @@ 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 boost::make_shared<TxAccept>(boost::cref(recordIds), boost::ref(records)); + return boost::shared_ptr<TxAccept>( + new TxAccept(boost::cref(recordIds), boost::ref(records))); } void TxReplicator::prepare(const string&, sys::Mutex::ScopedLock& l) { diff --git a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp index 90785263d3..512e71230b 100644 --- a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp +++ b/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp @@ -34,7 +34,6 @@ #include <qpid/store/StorageProvider.h> #include <qpid/sys/Mutex.h> #include <boost/foreach.hpp> -#include <boost/make_shared.hpp> // From ms-sql... #include "BlobAdapter.h" @@ -356,7 +355,7 @@ MSSqlClfsProvider::finalizeMe() MSSqlClfsProvider::MSSqlClfsProvider() : options("MS SQL/CLFS Provider options") { - transactions = boost::make_shared<TransactionLog>(); + transactions.reset(new TransactionLog()); } MSSqlClfsProvider::~MSSqlClfsProvider() diff --git a/cpp/src/tests/TransactionObserverTest.cpp b/cpp/src/tests/TransactionObserverTest.cpp index bc65c493c8..fd1c331ae7 100644 --- a/cpp/src/tests/TransactionObserverTest.cpp +++ b/cpp/src/tests/TransactionObserverTest.cpp @@ -30,7 +30,6 @@ #include <boost/bind.hpp> #include <boost/function.hpp> -#include <boost/make_shared.hpp> #include <boost/lexical_cast.hpp> #include <iostream> #include <vector> @@ -41,7 +40,6 @@ namespace tests { using framing::SequenceSet; using messaging::Message; using boost::shared_ptr; -using boost::make_shared; using namespace boost::assign; using namespace boost; @@ -81,7 +79,7 @@ struct MockBrokerObserver : public BrokerObserver { MockBrokerObserver(bool prep_=true) : prep(prep_) {} void startTx(const shared_ptr<TxBuffer>& buffer) { - tx = make_shared<MockTransactionObserver>(prep); + tx.reset(new MockTransactionObserver(prep)); buffer->setObserver(tx); } }; |