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 2009/05/06 16:59:25 UTC
svn commit: r772294 - in /qpid/trunk/qpid/cpp/src: ./ qpid/ qpid/acl/
qpid/broker/ qpid/client/ qpid/cluster/ qpid/framing/ qpid/xml/ tests/
Author: aconway
Date: Wed May 6 14:59:23 2009
New Revision: 772294
URL: http://svn.apache.org/viewvc?rev=772294&view=rev
Log:
Remove useless qpid/shared_ptr.h wrapper.
Removed:
qpid/trunk/qpid/cpp/src/qpid/shared_ptr.h
Modified:
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h
qpid/trunk/qpid/cpp/src/qpid/broker/TxOpVisitor.h
qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h
qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Wed May 6 14:59:23 2009
@@ -502,7 +502,6 @@
qpid/InlineVector.h \
qpid/InlineAllocator.h \
qpid/memory.h \
- qpid/shared_ptr.h \
qpid/Version.h \
qpid/broker/Broker.h \
qpid/broker/AclModule.h \
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Wed May 6 14:59:23 2009
@@ -22,7 +22,6 @@
#include "qpid/broker/Broker.h"
#include "qpid/Plugin.h"
#include "qpid/Options.h"
-#include "qpid/shared_ptr.h"
#include "qpid/log/Logger.h"
#include "qmf/org/apache/qpid/acl/Package.h"
#include "qmf/org/apache/qpid/acl/EventAllow.h"
@@ -32,6 +31,7 @@
#include <map>
+#include <boost/shared_ptr.hpp>
#include <boost/utility/in_place_factory.hpp>
using namespace std;
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h Wed May 6 14:59:23 2009
@@ -23,7 +23,6 @@
#include "qpid/acl/AclReader.h"
-#include "qpid/shared_ptr.h"
#include "qpid/RefCounted.h"
#include "qpid/broker/AclModule.h"
#include "qpid/management/Manageable.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp Wed May 6 14:59:23 2009
@@ -21,9 +21,9 @@
#include "qpid/broker/Broker.h"
#include "qpid/Plugin.h"
#include "qpid/Options.h"
-#include "qpid/shared_ptr.h"
#include "qpid/log/Statement.h"
+#include <boost/shared_ptr.hpp>
#include <boost/utility/in_place_factory.hpp>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h Wed May 6 14:59:23 2009
@@ -21,9 +21,8 @@
*/
-
-#include "qpid/shared_ptr.h"
#include "qpid/RefCounted.h"
+#include <boost/shared_ptr.hpp>
#include <map>
#include <set>
#include <string>
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed May 6 14:59:23 2009
@@ -237,7 +237,7 @@
Exchange::shared_ptr mExchange = exchanges.get (qpid_management);
Exchange::shared_ptr dExchange = exchanges.get (amq_direct);
((ManagementBroker*) managementAgent)->setExchange (mExchange, dExchange);
- dynamic_pointer_cast<ManagementExchange>(mExchange)->setManagmentAgent
+ boost::dynamic_pointer_cast<ManagementExchange>(mExchange)->setManagmentAgent
((ManagementBroker*) managementAgent);
}
else
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Wed May 6 14:59:23 2009
@@ -28,8 +28,8 @@
#include "qpid/framing/amqp_types.h"
#include "qpid/sys/Mutex.h"
#include "qpid/sys/Time.h"
-#include "qpid/shared_ptr.h"
#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
#include <string>
#include <vector>
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Wed May 6 14:59:23 2009
@@ -146,7 +146,7 @@
throw CommandInvalidException(QPID_MSG("Session has not been selected for use with dtx"));
}
dtxBuffer = DtxBuffer::shared_ptr(new DtxBuffer(xid));
- txBuffer = static_pointer_cast<TxBuffer>(dtxBuffer);
+ txBuffer = boost::static_pointer_cast<TxBuffer>(dtxBuffer);
if (join) {
mgr.join(xid, dtxBuffer);
} else {
@@ -214,7 +214,7 @@
checkDtxTimeout();
dtxBuffer->setSuspended(false);
- txBuffer = static_pointer_cast<TxBuffer>(dtxBuffer);
+ txBuffer = boost::static_pointer_cast<TxBuffer>(dtxBuffer);
}
void SemanticState::checkDtxTimeout()
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h Wed May 6 14:59:23 2009
@@ -36,7 +36,6 @@
#include "qpid/framing/Uuid.h"
#include "qpid/sys/AggregateOutput.h"
#include "qpid/sys/Mutex.h"
-#include "qpid/shared_ptr.h"
#include "AclModule.h"
#include <list>
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h Wed May 6 14:59:23 2009
@@ -102,10 +102,10 @@
const std::string& routingKey,
const framing::FieldTable& arguments);
private:
- void checkType(shared_ptr<Exchange> exchange, const std::string& type);
+ void checkType(boost::shared_ptr<Exchange> exchange, const std::string& type);
- void checkAlternate(shared_ptr<Exchange> exchange,
- shared_ptr<Exchange> alternate);
+ void checkAlternate(boost::shared_ptr<Exchange> exchange,
+ boost::shared_ptr<Exchange> alternate);
};
class QueueHandlerImpl : public QueueHandler,
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxOpVisitor.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxOpVisitor.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxOpVisitor.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxOpVisitor.h Wed May 6 14:59:23 2009
@@ -21,7 +21,6 @@
* under the License.
*
*/
-#include "qpid/shared_ptr.h"
namespace qpid {
namespace broker {
@@ -71,8 +70,6 @@
* under the License.
*
*/
-#include "qpid/shared_ptr.h"
-
namespace qpid {
namespace broker {
Modified: qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h Wed May 6 14:59:23 2009
@@ -24,6 +24,7 @@
#include "qpid/RefCounted.h"
#include "Future.h"
+#include <boost/shared_ptr.hpp>
namespace qpid {
namespace client {
@@ -33,7 +34,7 @@
{
public:
CompletionImpl() {}
- CompletionImpl(Future f, shared_ptr<SessionImpl> s) : future(f), session(s) {}
+ CompletionImpl(Future f, boost::shared_ptr<SessionImpl> s) : future(f), session(s) {}
bool isComplete() { return future.isComplete(*session); }
void wait() { future.wait(*session); }
@@ -41,7 +42,7 @@
protected:
Future future;
- shared_ptr<SessionImpl> session;
+ boost::shared_ptr<SessionImpl> session;
};
}} // namespace qpid::client
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Wed May 6 14:59:23 2009
@@ -28,7 +28,6 @@
#include "qpid/log/Logger.h"
#include "qpid/log/Options.h"
#include "qpid/log/Statement.h"
-#include "qpid/shared_ptr.h"
#include "qpid/framing/AMQP_HighestVersion.h"
#include <algorithm>
@@ -37,6 +36,7 @@
#include <functional>
#include <boost/format.hpp>
#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
using namespace qpid::framing;
using namespace qpid::sys;
@@ -47,7 +47,7 @@
Connection::Connection() : version(framing::highestProtocolVersion) {}
-Connection::~Connection(){ }
+Connection::~Connection() {}
void Connection::open(
const Url& url,
@@ -119,7 +119,7 @@
if (isOpen())
throw Exception(QPID_MSG("Connection::open() was already called"));
- impl = shared_ptr<ConnectionImpl>(new ConnectionImpl(version, settings));
+ impl = boost::shared_ptr<ConnectionImpl>(new ConnectionImpl(version, settings));
impl->open();
if ( failureCallback )
impl->registerFailureCallback ( failureCallback );
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h Wed May 6 14:59:23 2009
@@ -27,7 +27,6 @@
#include "qpid/client/Message.h"
#include "qpid/client/Completion.h"
#include "qpid/client/TypedResult.h"
-#include "qpid/shared_ptr.h"
#include "qpid/client/ClientImportExport.h"
#include <string>
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp Wed May 6 14:59:23 2009
@@ -37,6 +37,7 @@
#include "qpid/sys/IntegerTypes.h"
#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
namespace { const std::string EMPTY; }
@@ -51,7 +52,7 @@
typedef sys::ScopedLock<sys::Semaphore> Acquire;
-SessionImpl::SessionImpl(const std::string& name, shared_ptr<ConnectionImpl> conn)
+SessionImpl::SessionImpl(const std::string& name, boost::shared_ptr<ConnectionImpl> conn)
: state(INACTIVE),
detachedLifetime(0),
maxFrameSize(conn->getNegotiatedSettings().maxFrameSize),
@@ -119,7 +120,7 @@
waitFor(DETACHED);
}
-void SessionImpl::resume(shared_ptr<ConnectionImpl>) // user thread
+void SessionImpl::resume(boost::shared_ptr<ConnectionImpl>) // user thread
{
// weakPtr sessions should not be resumed.
if (weakPtr) return;
@@ -770,7 +771,7 @@
connectionShared = connectionWeak.lock();
}
-shared_ptr<ConnectionImpl> SessionImpl::getConnection()
+boost::shared_ptr<ConnectionImpl> SessionImpl::getConnection()
{
return connectionWeak.lock();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h Wed May 6 14:59:23 2009
@@ -28,8 +28,6 @@
#include "qpid/SessionId.h"
#include "qpid/SessionState.h"
-#include "boost/shared_ptr.hpp"
-#include "boost/weak_ptr.hpp"
#include "qpid/framing/FrameHandler.h"
#include "qpid/framing/ChannelHandler.h"
#include "qpid/framing/SequenceNumber.h"
@@ -39,6 +37,8 @@
#include "qpid/sys/StateMonitor.h"
#include "qpid/sys/ExceptionHolder.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
namespace qpid {
@@ -65,7 +65,7 @@
private framing::AMQP_ClientOperations::MessageHandler
{
public:
- SessionImpl(const std::string& name, shared_ptr<ConnectionImpl>);
+ SessionImpl(const std::string& name, boost::shared_ptr<ConnectionImpl>);
~SessionImpl();
@@ -79,7 +79,7 @@
void open(uint32_t detachedLifetime);
void close();
- void resume(shared_ptr<ConnectionImpl>);
+ void resume(boost::shared_ptr<ConnectionImpl>);
void suspend();
void assertOpen() const;
@@ -118,7 +118,7 @@
/**
* get the Connection associated with this connection
*/
- shared_ptr<ConnectionImpl> getConnection();
+ boost::shared_ptr<ConnectionImpl> getConnection();
private:
enum State {
@@ -209,7 +209,7 @@
const uint64_t maxFrameSize;
const SessionId id;
- shared_ptr<ConnectionImpl> connectionShared;
+ boost::shared_ptr<ConnectionImpl> connectionShared;
boost::weak_ptr<ConnectionImpl> connectionWeak;
bool weakPtr;
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Wed May 6 14:59:23 2009
@@ -46,10 +46,10 @@
#include "qpid/management/IdAllocator.h"
#include "qpid/management/ManagementBroker.h"
#include "qpid/memory.h"
-#include "qpid/shared_ptr.h"
#include "qpid/sys/Thread.h"
#include "qpid/sys/LatencyTracker.h"
+#include <boost/shared_ptr.hpp>
#include <boost/bind.hpp>
#include <boost/cast.hpp>
#include <boost/current_function.hpp>
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Wed May 6 14:59:23 2009
@@ -28,7 +28,6 @@
#include "qpid/broker/Broker.h"
#include "qpid/Plugin.h"
#include "qpid/Options.h"
-#include "qpid/shared_ptr.h"
#include "qpid/sys/AtomicValue.h"
#include "qpid/log/Statement.h"
@@ -39,6 +38,7 @@
#include "qpid/broker/SessionState.h"
#include "qpid/client/ConnectionSettings.h"
+#include <boost/shared_ptr.hpp>
#include <boost/utility/in_place_factory.hpp>
#include <boost/scoped_ptr.hpp>
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Wed May 6 14:59:23 2009
@@ -308,14 +308,14 @@
}
-shared_ptr<broker::Queue> Connection::findQueue(const std::string& qname) {
- shared_ptr<broker::Queue> queue = cluster.getBroker().getQueues().find(qname);
+boost::shared_ptr<broker::Queue> Connection::findQueue(const std::string& qname) {
+ boost::shared_ptr<broker::Queue> queue = cluster.getBroker().getQueues().find(qname);
if (!queue) throw Exception(QPID_MSG(cluster << " can't find queue " << qname));
return queue;
}
broker::QueuedMessage Connection::getUpdateMessage() {
- shared_ptr<broker::Queue> updateq = findQueue(UpdateClient::UPDATE);
+ boost::shared_ptr<broker::Queue> updateq = findQueue(UpdateClient::UPDATE);
assert(!updateq->isDurable());
broker::QueuedMessage m = updateq->get();
if (!m.payload) throw Exception(QPID_MSG(cluster << " empty update queue"));
@@ -359,7 +359,7 @@
}
void Connection::queuePosition(const string& qname, const SequenceNumber& position) {
- shared_ptr<broker::Queue> q = cluster.getBroker().getQueues().find(qname);
+ boost::shared_ptr<broker::Queue> q = cluster.getBroker().getQueues().find(qname);
if (!q) throw InvalidArgumentException(QPID_MSG("Invalid queue name " << qname));
q->setPosition(position);
}
@@ -377,18 +377,21 @@
}
void Connection::txStart() {
- txBuffer = make_shared_ptr(new broker::TxBuffer());
+ txBuffer.reset(new broker::TxBuffer());
}
void Connection::txAccept(const framing::SequenceSet& acked) {
- txBuffer->enlist(make_shared_ptr(new broker::TxAccept(acked, semanticState().getUnacked())));
+ txBuffer->enlist(boost::shared_ptr<broker::TxAccept>(
+ new broker::TxAccept(acked, semanticState().getUnacked())));
}
void Connection::txDequeue(const std::string& queue) {
- txBuffer->enlist(make_shared_ptr(new broker::RecoveredDequeue(findQueue(queue), getUpdateMessage().payload)));
+ txBuffer->enlist(boost::shared_ptr<broker::RecoveredDequeue>(
+ new broker::RecoveredDequeue(findQueue(queue), getUpdateMessage().payload)));
}
void Connection::txEnqueue(const std::string& queue) {
- txBuffer->enlist(make_shared_ptr(new broker::RecoveredEnqueue(findQueue(queue), getUpdateMessage().payload)));
+ txBuffer->enlist(boost::shared_ptr<broker::RecoveredEnqueue>(
+ new broker::RecoveredEnqueue(findQueue(queue), getUpdateMessage().payload)));
}
void Connection::txPublish(const framing::Array& queues, bool delivered) {
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h Wed May 6 14:59:23 2009
@@ -24,10 +24,10 @@
#include "amqp_types.h"
#include "AMQBody.h"
#include "qpid/framing/ProtocolVersion.h"
-#include "qpid/shared_ptr.h"
#include "qpid/CommonImportExport.h"
-#include <ostream>
+#include <boost/shared_ptr.hpp>
+#include <ostream>
#include <assert.h>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h Wed May 6 14:59:23 2009
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "qpid/shared_ptr.h"
+#include <boost/shared_ptr.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <assert.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp Wed May 6 14:59:23 2009
@@ -20,9 +20,9 @@
#include "qpid/acl/Acl.h"
#include "qpid/broker/Broker.h"
#include "qpid/Plugin.h"
-#include "qpid/shared_ptr.h"
#include "qpid/log/Statement.h"
+#include <boost/shared_ptr.hpp>
#include <boost/utility/in_place_factory.hpp>
#include "XmlExchange.h"
Modified: qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?rev=772294&r1=772293&r2=772294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Wed May 6 14:59:23 2009
@@ -63,7 +63,7 @@
{
TxPublishTest t;
- intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(t.msg);
+ intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(t.msg);
//ensure messages are enqueued in store
t.op.prepare(0);
BOOST_CHECK_EQUAL((size_t) 2, t.store.enqueued.size());
@@ -71,7 +71,7 @@
BOOST_CHECK_EQUAL(pmsg, t.store.enqueued[0].second);
BOOST_CHECK_EQUAL(string("queue2"), t.store.enqueued[1].first);
BOOST_CHECK_EQUAL(pmsg, t.store.enqueued[1].second);
- BOOST_CHECK_EQUAL( true, ( static_pointer_cast<PersistableMessage>(t.msg))->isEnqueueComplete());
+ BOOST_CHECK_EQUAL( true, ( boost::static_pointer_cast<PersistableMessage>(t.msg))->isEnqueueComplete());
}
QPID_AUTO_TEST_CASE(testCommit)
@@ -84,7 +84,7 @@
BOOST_CHECK_EQUAL((uint32_t) 1, t.queue1->getMessageCount());
intrusive_ptr<Message> msg_dequeue = t.queue1->get().payload;
- BOOST_CHECK_EQUAL( true, (static_pointer_cast<PersistableMessage>(msg_dequeue))->isEnqueueComplete());
+ BOOST_CHECK_EQUAL( true, (boost::static_pointer_cast<PersistableMessage>(msg_dequeue))->isEnqueueComplete());
BOOST_CHECK_EQUAL(t.msg, msg_dequeue);
BOOST_CHECK_EQUAL((uint32_t) 1, t.queue2->getMessageCount());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org