diff options
| author | Alan Conway <aconway@apache.org> | 2007-01-19 21:33:27 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-01-19 21:33:27 +0000 |
| commit | e861284318186f8d9cd64a7ddcc28b8d20b98721 (patch) | |
| tree | 6dac612d65297dc5f104350884fc01385c69ecda /gentools/src | |
| parent | 226be67c91b25a5ba8efdd9ba88566033ec97718 (diff) | |
| download | qpid-python-e861284318186f8d9cd64a7ddcc28b8d20b98721.tar.gz | |
Last big refactoring for 0-9 framing. Still need additional tests &
debugging but the overall structure is all in place.
* configure.ac: Added -Wno_virtual_overload warning
* ChannelTest.cpp, MessageBuilderTest.cpp: Fixed virtual overload warnings.
* ChannelAdapter.cpp: Common base for client/broker adapters.
Creates invocation context, handles request/resposne IDs.
* CppGenerator.java:
- Proxies send methods using MethodContext.
* Various .h files: removed unnecessary #includes, added to requred .cpp files.
* ConnectionContext: renamed from SessionContext.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@497963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'gentools/src')
| -rw-r--r-- | gentools/src/org/apache/qpid/gentools/CppGenerator.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/gentools/src/org/apache/qpid/gentools/CppGenerator.java index 938615bcfb..d6f9c5cf83 100644 --- a/gentools/src/org/apache/qpid/gentools/CppGenerator.java +++ b/gentools/src/org/apache/qpid/gentools/CppGenerator.java @@ -811,7 +811,7 @@ public class CppGenerator extends Generator for (String thisClassName : model.classMap.keySet()) { AmqpClass thisClass = model.classMap.get(thisClassName); - sb.append(indent + "virtual inline " + outerClassName + "::" + thisClass.name + "Handler* get" + + sb.append(indent + "virtual " + outerClassName + "::" + thisClass.name + "Handler* get" + thisClass.name + "Handler() { return &" + Utils.firstLower(thisClass.name) + ";}" + cr); } return sb.toString(); @@ -1064,10 +1064,10 @@ 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( parent->getProtocolVersion(), context.channelId," + cr); - sb.append(indent + tab + "new " + namespace + methodBodyClassName + "( parent->getProtocolVersion()"); + StringBuffer sb = new StringBuffer(); + sb.append(indent + tab + "(new " + namespace + methodBodyClassName + "( parent->getProtocolVersion()"); sb.append(generateMethodParameterList(fieldMap, indentSize + (5*tabSize), true, false, true)); - sb.append(" )));" + cr); + sb.append("))->send(context);\n"); return sb.toString(); } @@ -1145,7 +1145,7 @@ public class CppGenerator extends Generator for (Integer thisOrdinal : ordinalFieldMap.keySet()) { String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal); - sb.append(indent + "inline " + setRef(fieldDomainPair[FIELD_CODE_TYPE]) + " get" + + sb.append(indent + "" + setRef(fieldDomainPair[FIELD_CODE_TYPE]) + " get" + Utils.firstUpper(fieldDomainPair[FIELD_NAME]) + "() { return " + fieldDomainPair[FIELD_NAME] + "; }" + cr); } @@ -1451,7 +1451,7 @@ public class CppGenerator extends Generator if (bItr.next()) // This is a server operation { boolean fieldMapNotEmptyFlag = method.fieldMap.size() > 0; - sb.append(indent + "inline void invoke(AMQP_ServerOperations& target, const MethodContext& context)" + cr); + sb.append(indent + "void invoke(AMQP_ServerOperations& target, const MethodContext& context)" + cr); sb.append(indent + "{" + cr); sb.append(indent + tab + "target.get" + thisClass.name + "Handler()->" + parseForReservedWords(Utils.firstLower(method.name), |