diff options
Diffstat (limited to 'swift/src')
| -rw-r--r-- | swift/src/Ice/ConnectionInfoFactory.swift | 2 | ||||
| -rw-r--r-- | swift/src/Ice/EndpointI.swift | 4 | ||||
| -rw-r--r-- | swift/src/IceObjc/Util.mm | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/swift/src/Ice/ConnectionInfoFactory.swift b/swift/src/Ice/ConnectionInfoFactory.swift index fb0cd06745a..2b59a9ed260 100644 --- a/swift/src/Ice/ConnectionInfoFactory.swift +++ b/swift/src/Ice/ConnectionInfoFactory.swift @@ -120,7 +120,7 @@ class ConnectionInfoFactory: ICEConnectionInfoFactory { modelNumber: modelNumber, firmwareRevision: firmwareRevision, hardwareRevision: hardwareRevision, - _protocol: `protocol`) + protocol: `protocol`) } #endif diff --git a/swift/src/Ice/EndpointI.swift b/swift/src/Ice/EndpointI.swift index 6be8c60b20d..1efa892ae2e 100644 --- a/swift/src/Ice/EndpointI.swift +++ b/swift/src/Ice/EndpointI.swift @@ -151,14 +151,14 @@ class SSLEndpointInfoI: EndpointInfoI, SSLEndpointInfo {} var manufacturer: String var modelNumber: String var name: String - var _protocol: String + var `protocol`: String public init(handle: ICEEndpointInfo, underlying: EndpointInfo?, timeout: Int32, compress: Bool, manufacturer: String, modelNumber: String, name: String, protocol: String) { self.manufacturer = manufacturer self.modelNumber = modelNumber self.name = name - _protocol = `protocol` + self.protocol = `protocol` super.init(handle: handle, underlying: underlying, timeout: timeout, compress: compress) } } diff --git a/swift/src/IceObjc/Util.mm b/swift/src/IceObjc/Util.mm index 41764a45f1b..02d53a0948a 100644 --- a/swift/src/IceObjc/Util.mm +++ b/swift/src/IceObjc/Util.mm @@ -375,9 +375,10 @@ convertException(ICERuntimeException* exc) } @catch(...) { + return std::make_exception_ptr(Ice::UnknownException(file.c_str(), line, - fromNSString([exc className]))); + fromNSString(NSStringFromClass([exc class])))); } } |