From 879413783bf64537e3a1c7d036e2fb34700cc4e5 Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Tue, 9 Jan 2007 19:44:50 +0000 Subject: Most of remaining version changes for C++. Still need to deal with AMQFrame defualt constructor and do some clean up here and there.. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494540 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/common/framing/AMQFrame.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cpp/lib/common/framing/AMQFrame.h') diff --git a/cpp/lib/common/framing/AMQFrame.h b/cpp/lib/common/framing/AMQFrame.h index eb230c740c..d3c769087a 100644 --- a/cpp/lib/common/framing/AMQFrame.h +++ b/cpp/lib/common/framing/AMQFrame.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #ifndef _AMQFrame_ @@ -39,16 +40,17 @@ namespace qpid { class AMQFrame : virtual public AMQDataBlock { static AMQP_MethodVersionMap versionMap; - + qpid::framing::ProtocolVersion version; + u_int16_t channel; u_int8_t type;//used if the body is decoded separately from the 'head' AMQBody::shared_ptr body; AMQBody::shared_ptr createMethodBody(Buffer& buffer); public: - AMQFrame(); - AMQFrame(u_int16_t channel, AMQBody* body); - AMQFrame(u_int16_t channel, AMQBody::shared_ptr& body); + AMQFrame(qpid::framing::ProtocolVersion& _version = highestProtocolVersion); + AMQFrame(qpid::framing::ProtocolVersion& _version, u_int16_t channel, AMQBody* body); + AMQFrame(qpid::framing::ProtocolVersion& _version, u_int16_t channel, AMQBody::shared_ptr& body); virtual ~AMQFrame(); virtual void encode(Buffer& buffer); virtual bool decode(Buffer& buffer); -- cgit v1.2.1