4 files changed, 11 insertions, 11 deletions
diff --git a/swift/test/Ice/exceptions/AllTests.swift b/swift/test/Ice/exceptions/AllTests.swift
index fda7aafda47..71624b3578c 100644
--- a/swift/test/Ice/exceptions/AllTests.swift
+++ b/swift/test/Ice/exceptions/AllTests.swift
@@ -8,11 +8,11 @@ import PromiseKit
 
 class ServantLocatorI: Ice.ServantLocator {
 
-    func locate(_ curr: Current) throws -> (returnValue: Object?, cookie: AnyObject?) {
+    func locate(_ curr: Current) throws -> (returnValue: Disp?, cookie: AnyObject?) {
         return (nil, nil)
     }
 
-    func finished(curr: Current, servant: Object, cookie: AnyObject?) throws {
+    func finished(curr: Current, servant: Disp, cookie: AnyObject?) throws {
     }
 
     func deactivate(_ category: String) {
@@ -50,9 +50,9 @@ func allTests(_ helper: TestHelper) throws -> ThrowerPrx {
     communicator.getProperties().setProperty(key: "TestAdapter1.Endpoints", value: "tcp -h *")
     var adapter = try communicator.createObjectAdapter("TestAdapter1")
     let obj = EmptyI()
-    _ = try adapter.add(servant: obj, id: Ice.stringToIdentity("x"))
+    _ = try adapter.add(servant: EmptyDisp(obj), id: Ice.stringToIdentity("x"))
     do {
-        _ = try adapter.add(servant: obj, id: Ice.stringToIdentity("x"))
+        _ = try adapter.add(servant: EmptyDisp(obj), id: Ice.stringToIdentity("x"))
         try test(false)
     } catch is Ice.AlreadyRegisteredException {}
 
diff --git a/swift/test/Ice/exceptions/Collocated.swift b/swift/test/Ice/exceptions/Collocated.swift
index 07fd2e169ee..8ca47a8a677 100644
--- a/swift/test/Ice/exceptions/Collocated.swift
+++ b/swift/test/Ice/exceptions/Collocated.swift
@@ -30,7 +30,7 @@ class Collocated: TestHelperI {
         let adapter = try communicator.createObjectAdapter("TestAdapter")
 
         let obj = ThrowerI()
-        try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower"))
+        try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
 
         try adapter.activate()
 
diff --git a/swift/test/Ice/exceptions/Server.swift b/swift/test/Ice/exceptions/Server.swift
index d1cb9aeab4e..682ef6da0de 100644
--- a/swift/test/Ice/exceptions/Server.swift
+++ b/swift/test/Ice/exceptions/Server.swift
@@ -46,9 +46,9 @@ class Server: TestHelperI {
         let adapter3 = try communicator.createObjectAdapter("TestAdapter3")
 
         let obj = ThrowerI()
-        try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower"))
-        try adapter2.add(servant: obj, id: Ice.stringToIdentity("thrower"))
-        try adapter3.add(servant: obj, id: Ice.stringToIdentity("thrower"))
+        try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
+        try adapter2.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
+        try adapter3.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
 
         try adapter.activate()
         try adapter2.activate()
diff --git a/swift/test/Ice/exceptions/ServerAMD.swift b/swift/test/Ice/exceptions/ServerAMD.swift
index b9706ce81c7..3ec3c3f4c6a 100644
--- a/swift/test/Ice/exceptions/ServerAMD.swift
+++ b/swift/test/Ice/exceptions/ServerAMD.swift
@@ -46,9 +46,9 @@ class ServerAMD: TestHelperI {
         let adapter3 = try communicator.createObjectAdapter("TestAdapter3")
 
         let obj = ThrowerI()
-        try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower"))
-        try adapter2.add(servant: obj, id: Ice.stringToIdentity("thrower"))
-        try adapter3.add(servant: obj, id: Ice.stringToIdentity("thrower"))
+        try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
+        try adapter2.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
+        try adapter3.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower"))
 
         try adapter.activate()
         try adapter2.activate()