diff options
| author | Jose <jose@zeroc.com> | 2019-02-28 17:31:17 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-02-28 17:31:17 +0100 |
| commit | 23f379123a6314dfc6c881c105528e8238436684 (patch) | |
| tree | 68ccf3f6990d42da1970dc2b3d35e38d24b1d3d5 /cpp/src/slice2swift/SwiftUtil.cpp | |
| parent | Slice 2 Swift updates (diff) | |
| download | ice-23f379123a6314dfc6c881c105528e8238436684.tar.bz2 ice-23f379123a6314dfc6c881c105528e8238436684.tar.xz ice-23f379123a6314dfc6c881c105528e8238436684.zip | |
Fix delegate escaping
Diffstat (limited to 'cpp/src/slice2swift/SwiftUtil.cpp')
| -rw-r--r-- | cpp/src/slice2swift/SwiftUtil.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp index 9caf7470e54..1b402f4d846 100644 --- a/cpp/src/slice2swift/SwiftUtil.cpp +++ b/cpp/src/slice2swift/SwiftUtil.cpp @@ -269,6 +269,9 @@ SwiftGenerator::typeToString(const TypePtr& type, const ContainedPtr& toplevel, } ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); + ProxyPtr prx = ProxyPtr::dynamicCast(type); + ContainedPtr cont = ContainedPtr::dynamicCast(type); + if(cl) { // @@ -281,15 +284,11 @@ SwiftGenerator::typeToString(const TypePtr& type, const ContainedPtr& toplevel, } t += getUnqualified(getAbsoluteImpl(cl), currentModule); } - - ProxyPtr prx = ProxyPtr::dynamicCast(type); - if(prx) + else if(prx) { t = getUnqualified(getAbsoluteImpl(prx->_class(), "", "Prx"), currentModule); } - - ContainedPtr cont = ContainedPtr::dynamicCast(type); - if(cont) + else if(cont) { t = getUnqualified(getAbsoluteImpl(cont), currentModule); } |