* Added ClientAdapter - client side ChannelAdapter. Updated client side.

* Moved ChannelAdapter initialization from ctor to init(), updated broker side.
* Improved various exception messages with boost::format messages.
* Removed unnecssary virtual inheritance.
* Widespread: fixed incorrect non-const ProtocolVersion& parameters.
* Client API: pass channels by reference, not pointer.
* codegen:
 - MethodBodyClass.h.templ: Added CLASS_ID, METHOD_ID and isA() template.
 - Various: fixed non-const ProtocolVersion& parameters.
* cpp/bootstrap: Allow config arguments with -build.
* cpp/gen/Makefile.am: Merged codegen fixes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501087 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 6 deletions

diff --git a/cpp/lib/common/framing/AMQMethodBody.cpp b/cpp/lib/common/framing/AMQMethodBody.cpp
index 73b729b945..17138a401e 100644
--- a/cpp/lib/common/framing/AMQMethodBody.cpp
+++ b/cpp/lib/common/framing/AMQMethodBody.cpp
@@ -31,10 +31,6 @@ void AMQMethodBody::encodeId(Buffer& buffer) const{
     buffer.putShort(amqpMethodId());
 }
 
-bool AMQMethodBody::match(AMQMethodBody* other) const{
-    return other != 0 && other->amqpClassId() == amqpClassId() && other->amqpMethodId() == amqpMethodId();
-}
-
 void AMQMethodBody::invoke(AMQP_ServerOperations&, const MethodContext&){
     assert(0);
     THROW_QPID_ERROR(PROTOCOL_ERROR, "Method not supported by AMQP Server.");
@@ -44,14 +40,14 @@ AMQMethodBody::shared_ptr AMQMethodBody::create(
     AMQP_MethodVersionMap& versionMap, ProtocolVersion version,
     Buffer& buffer)
 {
-    MethodId id;
+    ClassMethodId id;
     id.decode(buffer);
     return AMQMethodBody::shared_ptr(
         versionMap.createMethodBody(
             id.classId, id.methodId, version.getMajor(), version.getMinor()));
 }
 
-void AMQMethodBody::MethodId::decode(Buffer& buffer) {
+void AMQMethodBody::ClassMethodId::decode(Buffer& buffer) {
     classId = buffer.getShort();
     methodId = buffer.getShort();
 }