diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-06-12 10:40:45 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-06-12 10:40:45 -0400 |
| commit | cc67bced069aee338441ae05f1670d07e531f91b (patch) | |
| tree | c696d1472495692142f018d168a636216de7af21 /cpp/src/slice2swift/Gen.cpp | |
| parent | Remove unreachable code (diff) | |
| download | ice-cc67bced069aee338441ae05f1670d07e531f91b.tar.bz2 ice-cc67bced069aee338441ae05f1670d07e531f91b.tar.xz ice-cc67bced069aee338441ae05f1670d07e531f91b.zip | |
Rename DefaultObjectImpl to ObjectI
Diffstat (limited to 'cpp/src/slice2swift/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2swift/Gen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp index ceaacf73b9f..a55c58a810c 100644 --- a/cpp/src/slice2swift/Gen.cpp +++ b/cpp/src/slice2swift/Gen.cpp @@ -1563,7 +1563,7 @@ Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "public let servant: " << servant; - out << nl << "private static let defaultObjectImpl = " << getUnqualified("Ice.DefaultObjectImpl", swiftModule) + out << nl << "private static let defaultObject = " << getUnqualified("Ice.ObjectI", swiftModule) << "<" << traits << ">()"; out << sp; @@ -1604,7 +1604,7 @@ Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) out.inc(); if(opName == "ice_id" || opName == "ice_ids" || opName == "ice_isA" || opName == "ice_ping") { - out << nl << "try (servant as? Object ?? " << disp << ".defaultObjectImpl)._iceD_" + out << nl << "try (servant as? Object ?? " << disp << ".defaultObject)._iceD_" << opName << "(incoming: inS, current: current)"; } else |