summaryrefslogtreecommitdiff
path: root/cpp/src/slice2swift/SwiftUtil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/slice2swift/SwiftUtil.cpp')
-rw-r--r--cpp/src/slice2swift/SwiftUtil.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
index 1f7db4c4980..67e4b8dd9f3 100644
--- a/cpp/src/slice2swift/SwiftUtil.cpp
+++ b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -1212,12 +1212,21 @@ SwiftGenerator::writeProxyOperation(::IceUtilInternal::Output& out, const Operat
out << spar;
if(returnType)
{
- out << typeToString(returnType, op);
+ string returnValueS = "returnValue";
+
+ for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q)
+ {
+ if((*q)->name() == "returnValue")
+ {
+ returnValueS = "_returnValue";
+ }
+ }
+ out << (returnValueS + ": " + typeToString(returnType, op));
}
for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
{
ParamDeclPtr param = *q;
- out << typeToString(param->type(), param, param->getMetaData(), param->optional());
+ out << (param->name() + ": " + typeToString(param->type(), param, param->getMetaData(), param->optional()));
}
out << epar;
}