diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2007-01-04 21:30:39 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2007-01-04 21:30:39 +0000 |
| commit | 077caff939a3647e7538c309863a012c92f1c767 (patch) | |
| tree | 0be71c5c4fbf83c289cb7db19e05fce116f25a5b /gentools | |
| parent | 9fae14cc56a6608cce8f398319a76ff8b7cb48be (diff) | |
| download | qpid-python-077caff939a3647e7538c309863a012c92f1c767.tar.gz | |
Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and tidy-up in related code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492756 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'gentools')
| -rw-r--r-- | gentools/src/org/apache/qpid/gentools/Main.java | 2 | ||||
| -rw-r--r-- | gentools/templ.cpp/AMQP_HighestVersion.h.tmpl (renamed from gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl) | 17 | ||||
| -rw-r--r-- | gentools/templ.java/MethodBodyClass.tmpl | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/gentools/src/org/apache/qpid/gentools/Main.java b/gentools/src/org/apache/qpid/gentools/Main.java index 39fb6c3c45..189d3eb5ae 100644 --- a/gentools/src/org/apache/qpid/gentools/Main.java +++ b/gentools/src/org/apache/qpid/gentools/Main.java @@ -202,7 +202,7 @@ public class Main new File(tmplDir + Utils.fileSeparator + "AMQP_Constants.h.tmpl"), new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.h.tmpl"), new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.cpp.tmpl"), - new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.cpp.tmpl") + new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl") }; methodTemplateFiles = new File[] { diff --git a/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl b/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl index e82a8d697d..96ee9416b0 100644 --- a/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl +++ b/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl @@ -1,4 +1,4 @@ -&{AMQP_HighestVersion.cpp} +&{AMQP_HighestVersion.h} /* * * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,18 @@ * Supported AMQP versions: %{VLIST} * ${major}-${minor} */ +#ifndef _AMQP_HighestVersion_ +#define _AMQP_HighestVersion_ -#include <AMQP_HighestVersion.h> +#include <ProtocolVersion.h> -qpid::framing::ProtocolVersion highestProtocolVersion(${hv_latest_major}, ${hv_latest_minor}); + +namespace qpid { +namespace framing { + +static ProtocolVersion highestProtocolVersion(${hv_latest_major}, ${hv_latest_minor}); + +} /* namespace framing */ +} /* namespace qpid */ + +#endif diff --git a/gentools/templ.java/MethodBodyClass.tmpl b/gentools/templ.java/MethodBodyClass.tmpl index ad1ce36006..04ce639f23 100644 --- a/gentools/templ.java/MethodBodyClass.tmpl +++ b/gentools/templ.java/MethodBodyClass.tmpl @@ -84,7 +84,7 @@ ${METHOD_ID_INIT} return buf.toString(); } - public static AMQFrame createAMQFrame(int channelId, byte major, byte minor + public static AMQFrame createAMQFrame(int _channelId, byte major, byte minor %{FLIST} ${mb_field_parameter_list} ) { @@ -92,7 +92,7 @@ ${METHOD_ID_INIT} %{FLIST} ${mb_field_body_initialize} AMQFrame frame = new AMQFrame(); - frame.channel = channelId; + frame.channel = _channelId; frame.bodyFrame = body; return frame; } |