4 files changed, 11 insertions, 4 deletions
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/cpp/src/qpid/framing/AMQMethodBody.cpp
index a7df0578c2..04941eaa58 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/cpp/src/qpid/framing/AMQMethodBody.cpp
@@ -36,6 +36,10 @@ void AMQMethodBody::invoke(AMQP_ServerOperations&, const MethodContext&){
     THROW_QPID_ERROR(PROTOCOL_ERROR, "Method not supported by AMQP Server.");
 }
 
+bool AMQMethodBody::invoke(Invocable*) {
+    return false;
+}
+
 AMQMethodBody::shared_ptr AMQMethodBody::create(
     AMQP_MethodVersionMap& versionMap, ProtocolVersion version,
     Buffer& buffer)
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h
index 306c26cd27..55cf5cb864 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/cpp/src/qpid/framing/AMQMethodBody.h
@@ -52,6 +52,7 @@ class AMQMethodBody : public AMQBody
     virtual ClassId  amqpClassId() const = 0;
     
     virtual void invoke(AMQP_ServerOperations&, const MethodContext&);
+    virtual bool invoke(Invocable* target);
 
     template <class T> bool isA() {
         return amqpClassId()==T::CLASS_ID && amqpMethodId()==T::METHOD_ID;
diff --git a/cpp/src/qpid/framing/ChannelAdapter.h b/cpp/src/qpid/framing/ChannelAdapter.h
index 1c3f29d762..50b1c9ff7e 100644
--- a/cpp/src/qpid/framing/ChannelAdapter.h
+++ b/cpp/src/qpid/framing/ChannelAdapter.h
@@ -78,10 +78,6 @@ class ChannelAdapter : protected BodyHandler {
     RequestId send(shared_ptr<AMQBody> body,
                    Correlator::Action action=Correlator::Action());
 
-    // TODO aconway 2007-04-05:  remove and use make_shared_ptr at call sites.
-    /**@deprecated Use make_shared_ptr with the other send() override */
-    RequestId send(AMQBody* body) { return send(AMQBody::shared_ptr(body)); }
-
     virtual bool isOpen() const = 0;
     
     RequestId getFirstAckRequest() { return requester.getFirstAckRequest(); }
diff --git a/cpp/src/qpid/framing/SequenceNumber.h b/cpp/src/qpid/framing/SequenceNumber.h
index bf9d133cef..3e0dfea2af 100644
--- a/cpp/src/qpid/framing/SequenceNumber.h
+++ b/cpp/src/qpid/framing/SequenceNumber.h
@@ -48,6 +48,12 @@ class SequenceNumber
     friend int32_t operator-(const SequenceNumber& a, const SequenceNumber& b);
 };    
 
+struct Window 
+{
+    SequenceNumber hwm;
+    SequenceNumber lwm;
+};
+
 }} // namespace qpid::framing