slice2swift Object fixes

1 files changed, 3 insertions, 7 deletions

diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
index 6f6dfeb1fbe..81812438b67 100644
--- a/cpp/src/slice2swift/SwiftUtil.cpp
+++ b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -1975,16 +1975,15 @@ SwiftGenerator::writeDispatchOperation(::IceUtilInternal::Output& out, const Ope
 void
 SwiftGenerator::writeDispatchAsyncOperation(::IceUtilInternal::Output& out, const OperationPtr& op)
 {
-    const string opName = fixIdent(op->name());
+    const string opName = fixIdent(op->name() + (operationIsAmd(op) ? "Async" : ""));
 
     const ParamInfoList allInParams = getAllInParams(op);
     const ParamInfoList allOutParams = getAllOutParams(op);
-    const ExceptionList allExceptions = op->throws();
 
     const string swiftModule = getSwiftModule(getTopLevelModule(ContainedPtr::dynamicCast(op)));
 
     out << sp;
-    out << nl << "func iceD_" << opName;
+    out << nl << "func iceD_" <<  fixIdent(op->name());
     out << spar;
     out << ("incoming inS: " + getUnqualified("Ice.Incoming", swiftModule));
     out << ("current: " + getUnqualified("Ice.Current", swiftModule));
@@ -2013,10 +2012,7 @@ SwiftGenerator::writeDispatchAsyncOperation(::IceUtilInternal::Output& out, cons
     out << "firstly";
     out << sb;
     out << nl << opName;
-    if(operationIsAmd(op))
-    {
-        out << "Async";
-    }
+
     out << spar;
     for(ParamInfoList::const_iterator q = allInParams.begin(); q != allInParams.end(); ++q)
     {