diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 18:18:02 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 18:18:02 +0000 |
| commit | e0fb5b8a7676221cf40aa9227b0540caea942955 (patch) | |
| tree | c67f15f9a07c0bc110dd18a578ff64dbd1cece00 /cpp/src/slice2cpp/Gen.cpp | |
| parent | Added support for alternate sequences Added custom test (diff) | |
| download | ice-e0fb5b8a7676221cf40aa9227b0540caea942955.tar.bz2 ice-e0fb5b8a7676221cf40aa9227b0540caea942955.tar.xz ice-e0fb5b8a7676221cf40aa9227b0540caea942955.zip | |
Fixed alternate sequences for AMI/AMD
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 035dfa7794d..79843be2ce1 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -3849,9 +3849,9 @@ Slice::Gen::ImplVisitor::ImplVisitor(Output& h, Output& c, } void -Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePtr& type) +Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePtr& type, const StringList& metaData) { - out << nl << typeToString(type) << ' ' << name; + out << nl << typeToString(type, metaData) << ' ' << name; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); if(builtin) @@ -3898,7 +3898,7 @@ Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePt } void -Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type) +Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const StringList& metaData) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); if(builtin) @@ -3972,7 +3972,7 @@ Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type) SequencePtr seq = SequencePtr::dynamicCast(type); if(seq) { - out << nl << "return " << fixKwd(seq->scoped()) << "();"; + out << nl << "return " << typeToString(seq, metaData) << "();"; } else { @@ -4111,13 +4111,13 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p) } if(ret) { - writeDecl(C, result, ret); + writeDecl(C, result, ret, op->getMetaData()); } for(q = paramList.begin(); q != paramList.end(); ++q) { if((*q)->isOutParam()) { - writeDecl(C, fixKwd((*q)->name()), (*q)->type()); + writeDecl(C, fixKwd((*q)->name()), (*q)->type(), (*q)->getMetaData()); } } @@ -4231,7 +4231,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p) if(ret) { - writeReturn(C, ret); + writeReturn(C, ret, op->getMetaData()); } C << eb; |