You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2013/08/05 18:35:04 UTC
svn commit: r1510596 - in /qpid/trunk/qpid/cpp/src: qpid/ha/Primary.cpp
qpid/ha/PrimaryTxObserver.cpp qpid/ha/TxReplicator.cpp
qpid/store/ms-clfs/MSSqlClfsProvider.cpp tests/TransactionObserverTest.cpp
Author: aconway
Date: Mon Aug 5 16:35:03 2013
New Revision: 1510596
URL: http://svn.apache.org/r1510596
Log:
NO-JIRA: Remove use of boost::make_shared, not availble on some older versions.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp?rev=1510596&r1=1510595&r2=1510596&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp Mon Aug 5 16:35:03 2013
@@ -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;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp?rev=1510596&r1=1510595&r2=1510596&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp Mon Aug 5 16:35:03 2013
@@ -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(HaB
}
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)
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp?rev=1510596&r1=1510595&r2=1510596&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp Mon Aug 5 16:35:03 2013
@@ -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::addReco
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) {
Modified: qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp?rev=1510596&r1=1510595&r2=1510596&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp Mon Aug 5 16:35:03 2013
@@ -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()
Modified: qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp?rev=1510596&r1=1510595&r2=1510596&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp Mon Aug 5 16:35:03 2013
@@ -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 Broke
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);
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org