From 7847c1c0326e654845868ab4ab4ec27863a3e777 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 3 Nov 2006 21:27:48 +0000 Subject: Added protocol version and version exception classes in preparation for multi-protocol generation. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@471002 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/framing/ProtocolInitiation.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cpp/src/qpid/framing/ProtocolInitiation.cpp') diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/cpp/src/qpid/framing/ProtocolInitiation.cpp index aebdf6709e..23e2a24355 100644 --- a/cpp/src/qpid/framing/ProtocolInitiation.cpp +++ b/cpp/src/qpid/framing/ProtocolInitiation.cpp @@ -19,7 +19,9 @@ qpid::framing::ProtocolInitiation::ProtocolInitiation(){} -qpid::framing::ProtocolInitiation::ProtocolInitiation(u_int8_t _major, u_int8_t _minor) : pmajor(_major), pminor(_minor){} +qpid::framing::ProtocolInitiation::ProtocolInitiation(u_int8_t _major, u_int8_t _minor) : version(_major, _minor) {} + +qpid::framing::ProtocolInitiation::ProtocolInitiation(const qpid::framing::ProtocolVersion& p) : version(p) {} qpid::framing::ProtocolInitiation::~ProtocolInitiation(){} @@ -30,8 +32,8 @@ void qpid::framing::ProtocolInitiation::encode(Buffer& buffer){ buffer.putOctet('P'); buffer.putOctet(1);//class buffer.putOctet(1);//instance - buffer.putOctet(pmajor); - buffer.putOctet(pminor); + buffer.putOctet(version.major_); + buffer.putOctet(version.minor_); } bool qpid::framing::ProtocolInitiation::decode(Buffer& buffer){ @@ -42,8 +44,8 @@ bool qpid::framing::ProtocolInitiation::decode(Buffer& buffer){ buffer.getOctet();//P buffer.getOctet();//class buffer.getOctet();//instance - pmajor = buffer.getOctet(); - pminor = buffer.getOctet(); + version.major_ = buffer.getOctet(); + version.minor_ = buffer.getOctet(); return true; }else{ return false; -- cgit v1.2.1