You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2007/01/09 21:15:52 UTC
svn commit: r494553 - in /incubator/qpid/trunk/qpid/gentools:
src/org/apache/qpid/gentools/CppGenerator.java
templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
templ.cpp/AMQP_MethodVersionMap.h.tmpl
Author: cctrieloff
Date: Tue Jan 9 12:15:52 2007
New Revision: 494553
URL: http://svn.apache.org/viewvc?view=rev&rev=494553
Log:
code gen part of last change. requires bootstrap
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java?view=diff&rev=494553&r1=494552&r2=494553
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java Tue Jan 9 12:15:52 2007
@@ -1073,7 +1073,7 @@
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);
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl?view=diff&rev=494553&r1=494552&r2=494553
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl Tue Jan 9 12:15:52 2007
@@ -35,7 +35,7 @@
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}
}
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=494553&r1=494552&r2=494553
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl Tue Jan 9 12:15:52 2007
@@ -45,10 +45,9 @@
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);
};