diff options
Diffstat (limited to 'qpid/cpp/gentools/src')
| -rw-r--r-- | qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java | 13 | ||||
| -rw-r--r-- | qpid/cpp/gentools/src/org/apache/qpid/gentools/Main.java | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java index 80ce266f39..114e3308d3 100644 --- a/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java +++ b/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java @@ -1164,7 +1164,7 @@ public class CppGenerator extends Generator { String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal); sb.append(indent + "" + setRef(fieldDomainPair[FIELD_CODE_TYPE]) + " get" + - Utils.firstUpper(fieldDomainPair[FIELD_NAME]) + "() { return " + + Utils.firstUpper(fieldDomainPair[FIELD_NAME]) + "() const { return " + fieldDomainPair[FIELD_NAME] + "; }" + cr); } return sb.toString(); @@ -1443,12 +1443,13 @@ public class CppGenerator extends Generator StringBuffer sb = new StringBuffer(); if (method.fieldMap.size() > 0) { - sb.append(indent + thisClass.name + Utils.firstUpper(method.name) + "Body(ProtocolVersion version," + cr); + sb.append(indent + thisClass.name + Utils.firstUpper(method.name) + "Body(ProtocolVersion," + cr); sb.append(generateFieldList(method.fieldMap, version, true, false, 8)); - sb.append(indent + tab + ") : " + baseClass(method, version) + "(version"); - sb.append(")"); - if (method.fieldMap.size() > 0) - sb.append(", \n" + generateFieldList(method.fieldMap, version, false, true, 8)); + sb.append(indent + tab + ")"); + if (method.fieldMap.size() > 0) { + sb.append(" : "); + sb.append(generateFieldList(method.fieldMap, version, false, true, 8)); + } sb.append(indent + "{ }\n"); } return sb.toString(); diff --git a/qpid/cpp/gentools/src/org/apache/qpid/gentools/Main.java b/qpid/cpp/gentools/src/org/apache/qpid/gentools/Main.java index 74e1ce1ab9..a25ddd103c 100644 --- a/qpid/cpp/gentools/src/org/apache/qpid/gentools/Main.java +++ b/qpid/cpp/gentools/src/org/apache/qpid/gentools/Main.java @@ -234,9 +234,7 @@ public class Main new File(tmplDir + Utils.fileSeparator + "AMQP_ServerOperations.h.tmpl"), new File(tmplDir + Utils.fileSeparator + "AMQP_ClientOperations.h.tmpl"), 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.h.tmpl") + new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl") }; methodTemplateFiles = new File[] { |