diff options
Diffstat (limited to 'qpid/gentools')
| -rw-r--r-- | qpid/gentools/src/org/apache/qpid/gentools/Main.java | 2 | ||||
| -rw-r--r-- | qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl (renamed from qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl) | 17 | ||||
| -rw-r--r-- | qpid/gentools/templ.java/MethodBodyClass.tmpl | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/qpid/gentools/src/org/apache/qpid/gentools/Main.java b/qpid/gentools/src/org/apache/qpid/gentools/Main.java index 39fb6c3c45..189d3eb5ae 100644 --- a/qpid/gentools/src/org/apache/qpid/gentools/Main.java +++ b/qpid/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/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl b/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl index e82a8d697d..96ee9416b0 100644 --- a/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl +++ b/qpid/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/qpid/gentools/templ.java/MethodBodyClass.tmpl b/qpid/gentools/templ.java/MethodBodyClass.tmpl index ad1ce36006..04ce639f23 100644 --- a/qpid/gentools/templ.java/MethodBodyClass.tmpl +++ b/qpid/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; } |