summaryrefslogtreecommitdiff
path: root/cpp/src/slice2swift/Gen.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2019-03-18 14:31:29 -0400
committerJoe George <joe@zeroc.com>2019-03-18 14:31:29 -0400
commit7568dbe07368f4fc5c88ab19593d294401874889 (patch)
tree5c59fed7c6144a106016f8103c8ecc03de8255d5 /cpp/src/slice2swift/Gen.cpp
parentProxy unmarshaling cleanup for streaming (diff)
downloadice-7568dbe07368f4fc5c88ab19593d294401874889.tar.bz2
ice-7568dbe07368f4fc5c88ab19593d294401874889.tar.xz
ice-7568dbe07368f4fc5c88ab19593d294401874889.zip
Add ice_staticId and fix proxy unmarshaling func label
Diffstat (limited to 'cpp/src/slice2swift/Gen.cpp')
-rw-r--r--cpp/src/slice2swift/Gen.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp
index 1041d9c0b2c..4afd58a87e7 100644
--- a/cpp/src/slice2swift/Gen.cpp
+++ b/cpp/src/slice2swift/Gen.cpp
@@ -867,19 +867,28 @@ Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
out << eb;
//
+ // ice_staticId
+ //
+ out << sp;
+ out << nl << "public func ice_staticId" << spar << ("_ type: " + prx + ".Protocol") << epar << " -> Swift.String";
+ out << sb;
+ out << nl << "return " << prxI << ".ice_staticId()";
+ out << eb;
+
+ //
// InputStream extension
//
out << sp;
out << nl << "public extension " << getUnqualified("Ice.InputStream", swiftModule);
out << sb;
- out << nl << "func read(_ prx: " << prx << ".Protocol) throws -> " << prx << "?";
+ out << nl << "func read(_ type: " << prx << ".Protocol) throws -> " << prx << "?";
out << sb;
out << nl << "return try read() as " << prxI << "?";
out << eb;
out << sp;
- out << nl << "func read(tag: Int32, prx: " << prx << ".Protocol) throws -> " << prx << "?";
+ out << nl << "func read(tag: Int32, type: " << prx << ".Protocol) throws -> " << prx << "?";
out << sb;
out << nl << "return try read(tag: tag) as " << prxI << "?";
out << eb;