diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2006-11-22 16:57:35 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2006-11-22 16:57:35 +0000 |
| commit | d46ac2955c4871c9f22067f47490095e2c5f1806 (patch) | |
| tree | 7e76ef7e4ca47e4cc57c83f7950bf97c3eceb210 /cpp/src/qpid/framing/AMQFrame.h | |
| parent | 018723f3889e9a1f63585dddba8eecff1d168501 (diff) | |
| download | qpid-python-d46ac2955c4871c9f22067f47490095e2c5f1806.tar.gz | |
Merged AMQP version-sensitive generated files with C++ trunk. Phase 1 of merge complete - all locations where version info is required in the framing, broker and client code, the version has been hard-coded to mahor=8, minor=0. Next step: make broker and client version-aware.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478237 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/framing/AMQFrame.h')
| -rw-r--r-- | cpp/src/qpid/framing/AMQFrame.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h index bb1ecfac36..29ee1250e1 100644 --- a/cpp/src/qpid/framing/AMQFrame.h +++ b/cpp/src/qpid/framing/AMQFrame.h @@ -18,7 +18,7 @@ * under the License. * */ -#include <qpid/framing/amqp_methods.h> +/*#include <qpid/framing/amqp_methods.h>*/ #include <qpid/framing/amqp_types.h> #include <qpid/framing/AMQBody.h> #include <qpid/framing/AMQDataBlock.h> @@ -26,6 +26,7 @@ #include <qpid/framing/AMQHeaderBody.h> #include <qpid/framing/AMQContentBody.h> #include <qpid/framing/AMQHeartbeatBody.h> +#include <qpid/framing/AMQP_MethodVersionMap.h> #include <qpid/framing/Buffer.h> #ifndef _AMQFrame_ @@ -39,7 +40,9 @@ namespace qpid { u_int16_t channel; u_int8_t type;//used if the body is decoded separately from the 'head' AMQBody::shared_ptr body; - + AMQP_MethodVersionMap versionMap; + AMQBody::shared_ptr createMethodBody(Buffer& buffer); + public: AMQFrame(); AMQFrame(u_int16_t channel, AMQBody* body); |