summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl C. Trieloff <cctrieloff@apache.org>2007-01-09 20:15:52 +0000
committerCarl C. Trieloff <cctrieloff@apache.org>2007-01-09 20:15:52 +0000
commitbb01c5fc091389e6f29d753a43cfa40e58c5124c (patch)
treead2fd532eef7dc4e97826e2f05bf8aa8f9e1de82
parent879413783bf64537e3a1c7d036e2fb34700cc4e5 (diff)
downloadqpid-python-bb01c5fc091389e6f29d753a43cfa40e58c5124c.tar.gz
code gen part of last change. requires bootstrap
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494553 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--gentools/src/org/apache/qpid/gentools/CppGenerator.java2
-rw-r--r--gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl2
-rw-r--r--gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl3
3 files changed, 3 insertions, 4 deletions
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index f1e7063800..06454ddeb9 100644
--- a/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
@@ -1073,7 +1073,7 @@ public class CppGenerator extends Generator
String indent = Utils.createSpaces(indentSize);
String tab = Utils.createSpaces(tabSize);
String namespace = version != null ? version.namespace() + "::" : "";
- StringBuffer sb = new StringBuffer(indent + "out->send( new AMQFrame( channel," + cr);
+ StringBuffer sb = new StringBuffer(indent + "out->send( new AMQFrame(parent->getProtocolVersion(), channel," + cr);
sb.append(indent + tab + "new " + namespace + methodBodyClassName + "( parent->getProtocolVersion()");
sb.append(generateMethodParameterList(fieldMap, indentSize + (5*tabSize), true, false, true));
sb.append(" )));" + cr);
diff --git a/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index 6ab7812499..dc2a890c88 100644
--- a/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -35,7 +35,7 @@ namespace qpid
namespace framing
{
-AMQP_MethodVersionMap::AMQP_MethodVersionMap(u_int8_t major, u_int8_t minor): version(major, minor)
+AMQP_MethodVersionMap::AMQP_MethodVersionMap()
{
%{CLIST} ${mc_create_method_body_map_entry}
}
diff --git a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index d3ad37a8e0..6db1ceae0c 100644
--- a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -45,10 +45,9 @@ typedef AMQMethodBody* (*fnPtr)(u_int8_t, u_int8_t);
class AMQP_MethodVersionMap: public std::map<u_int64_t, fnPtr>
{
protected:
- ProtocolVersion version;
u_int64_t createMapKey(u_int16_t classId, u_int16_t methodId, u_int8_t major, u_int8_t minor);
public:
- AMQP_MethodVersionMap(u_int8_t major, u_int8_t minor);
+ AMQP_MethodVersionMap();
AMQMethodBody* createMethodBody(u_int16_t classId, u_int16_t methodId, u_int8_t major, u_int8_t minor);
};