Fix cluster code for heap reuduction commit.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@567109 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 3 insertions, 2 deletions

diff --git a/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp b/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
index 9410a3cc38..fc7765eef6 100644
--- a/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
+++ b/qpid/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 AMQMethodBody*& body) {
+FullMethodId fullId(const AMQMethodBody* body) {
     return fullId(body->amqpClassId(), body->amqpMethodId());
 }
 
diff --git a/qpid/cpp/src/qpid/cluster/SessionManager.cpp b/qpid/cpp/src/qpid/cluster/SessionManager.cpp
index b8290ad953..44c5ff24c5 100644
--- a/qpid/cpp/src/qpid/cluster/SessionManager.cpp
+++ b/qpid/cpp/src/qpid/cluster/SessionManager.cpp
@@ -55,7 +55,7 @@ struct BrokerHandler : public FrameHandler, private ChannelAdapter, private Deli
         adapter(channel, connection, broker, *this) {}
 
     void handle(AMQFrame& frame) {
-        AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.body.get());
+        AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.getBody());
         assert(body);
         body->invoke(adapter);
     }
diff --git a/qpid/cpp/src/tests/Cluster.cpp b/qpid/cpp/src/tests/Cluster.cpp
index 2d23b87627..f3a50e2094 100644
--- a/qpid/cpp/src/tests/Cluster.cpp
+++ b/qpid/cpp/src/tests/Cluster.cpp
@@ -21,6 +21,7 @@
 
 #include "qpid/framing/SessionPingBody.h"
 #include "qpid/framing/SessionPongBody.h"
+#include "qpid/framing/all_method_bodies.h"
 #include "qpid/cluster/ClassifierHandler.h"
 
 #define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>