3 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/qpid/cluster/ClassifierHandler.cpp b/cpp/src/qpid/cluster/ClassifierHandler.cpp
index 1cce126800..9410a3cc38 100644
--- a/cpp/src/qpid/cluster/ClassifierHandler.cpp
+++ b/cpp/src/qpid/cluster/ClassifierHandler.cpp
@@ -36,7 +36,7 @@ typedef uint32_t FullMethodId;  // Combind class & method ID.
 
 FullMethodId fullId(ClassId c, MethodId m) { return c<<16+m; }
 
-FullMethodId fullId(const shared_ptr<AMQMethodBody>& body) {
+FullMethodId fullId(const AMQMethodBody*& body) {
     return fullId(body->amqpClassId(), body->amqpMethodId());
 }
 
@@ -59,8 +59,8 @@ void  ClassifierHandler::handle(AMQFrame& frame) {
     // TODO aconway 2007-07-03: Flatten the frame hierarchy so we
     // can do a single lookup to dispatch a frame.
     Chain chosen;
-    shared_ptr<AMQMethodBody> method =
-        dynamic_pointer_cast<AMQMethodBody>(frame.getBody());
+    AMQMethodBody* method = dynamic_cast<AMQMethodBody*>(frame.getBody());
+
     // FIXME aconway 2007-07-05: Need to stop bypassed frames
     // from overtaking mcast frames.
     //
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index e5af237bd2..d9f1679fdf 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -95,7 +95,7 @@ void Cluster::handle(AMQFrame& frame) {
 
 void Cluster::notify() {
     AMQFrame frame(ProtocolVersion(), 0,
-                   new ClusterNotifyBody(ProtocolVersion(), url));
+                   ClusterNotifyBody(ProtocolVersion(), url));
     handle(frame);
 }
 
diff --git a/cpp/src/qpid/cluster/SessionManager.cpp b/cpp/src/qpid/cluster/SessionManager.cpp
index a4efa939fc..b8290ad953 100644
--- a/cpp/src/qpid/cluster/SessionManager.cpp
+++ b/cpp/src/qpid/cluster/SessionManager.cpp
@@ -36,7 +36,7 @@ using namespace sys;
 using namespace broker;
 
 /** Handler to send frames direct to local broker (bypass correlation etc.) */
-    struct BrokerHandler : public FrameHandler, private ChannelAdapter, private DeliveryAdapter {
+struct BrokerHandler : public FrameHandler, private ChannelAdapter, private DeliveryAdapter {
     Connection connection;
     Channel channel;
     BrokerAdapter adapter;
@@ -61,13 +61,13 @@ using namespace broker;
     }
 
     // Dummy methods.
-    virtual void handleHeader(boost::shared_ptr<AMQHeaderBody>){}
-    virtual void handleContent(boost::shared_ptr<AMQContentBody>){}
-    virtual void handleHeartbeat(boost::shared_ptr<AMQHeartbeatBody>){}
+    virtual void handleHeader(AMQHeaderBody*){}
+    virtual void handleContent(AMQContentBody*){}
+    virtual void handleHeartbeat(AMQHeartbeatBody*){}
     virtual bool isOpen() const{ return true; }
-    virtual void handleMethod(shared_ptr<AMQMethodBody>){}
+    virtual void handleMethod(AMQMethodBody*){}
     // No-op send.
-        virtual void send(shared_ptr<AMQBody>) {}
+    virtual void send(const AMQBody&) {}
 
     //delivery adapter methods, also no-ops:
     virtual DeliveryId deliver(Message::shared_ptr&, DeliveryToken::shared_ptr) { return 0; }