diff options
| author | Joe George <joe@zeroc.com> | 2019-02-26 10:23:27 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2019-02-26 10:51:07 -0500 |
| commit | 3fbade0b8f60b85c3f43884883d8c262399e2cab (patch) | |
| tree | 087ab3f1e25ea3081888534e61c14a25837e1f24 /cpp/src/slice2swift/SwiftUtil.cpp | |
| parent | Remove TestCommon from Ice project (diff) | |
| download | ice-3fbade0b8f60b85c3f43884883d8c262399e2cab.tar.bz2 ice-3fbade0b8f60b85c3f43884883d8c262399e2cab.tar.xz ice-3fbade0b8f60b85c3f43884883d8c262399e2cab.zip | |
Various fixes
Diffstat (limited to 'cpp/src/slice2swift/SwiftUtil.cpp')
| -rw-r--r-- | cpp/src/slice2swift/SwiftUtil.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp index bc41d2bfa13..fcf7b72bff0 100644 --- a/cpp/src/slice2swift/SwiftUtil.cpp +++ b/cpp/src/slice2swift/SwiftUtil.cpp @@ -688,9 +688,7 @@ SwiftGenerator::writeCastFuncs(IceUtilInternal::Output& out, const ClassDefPtr& out << "func read(proxyArray: " << prx << ".Protocol) throws -> [" << prx << "?]"; out << sb << nl; - // out << "return try " << prxImpl << ".ice_read(from: self)"; - out << "#warning(\"add generated proxy arrays\")" << nl; - out << "preconditionFailure(\"TODO\")"; + out << "return try read(proxyArray: " << prxImpl << ".self)"; out << eb << nl; out << eb << nl; } @@ -728,11 +726,11 @@ SwiftGenerator::writeMarshalUnmarshalCode(IceUtilInternal::Output& out, const Cl const SequencePtr sequence = SequencePtr::dynamicCast(op->returnType()); if(isProxyType((*q)->type())) { - out << nl << "os.write(proxy: " << (*q)->name() << ")"; + out << nl << "try os.write(proxy: " << (*q)->name() << ")"; } else if(sequence && isProxyType(sequence->type())) { - out << nl << "os.write(proxyArray: " << (*q)->name() << ")"; + out << nl << "try os.write(proxyArray: " << (*q)->name() << ")"; } else { |