From 63fa33bdab21d475aa559fcdd350ae00b2faa133 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 5 Jun 2024 13:57:48 -0400 Subject: [PATCH] Swift cleanup (#2272) --- swift/src/Glacier2/Glacier2Swift.h | 5 +- swift/src/Ice/Blobject.swift | 4 +- swift/src/Ice/BlobjectAsync.swift | 4 +- swift/src/Ice/ClassResolver.swift | 4 +- swift/src/Ice/Communicator.swift | 142 +--- swift/src/Ice/CommunicatorI.swift | 4 +- swift/src/Ice/Connection.swift | 95 ++- swift/src/Ice/ConnectionI.swift | 4 +- swift/src/Ice/ConnectionInfoFactory.swift | 4 +- swift/src/Ice/Current.swift | 2 +- swift/src/Ice/Endpoint.swift | 51 +- swift/src/Ice/EndpointI.swift | 4 +- swift/src/Ice/EndpointInfoFactory.swift | 4 +- swift/src/Ice/EndpointSelectionType.swift | 23 +- swift/src/Ice/Exception.swift | 5 +- swift/src/Ice/FacetMap.swift | 17 +- swift/src/Ice/FormatType.swift | 5 +- swift/src/Ice/IAPConnectionInfo.swift | 27 +- swift/src/Ice/IAPEndpointInfo.swift | 23 +- swift/src/Ice/IceSwift.h | 5 +- swift/src/Ice/ImplicitContext.swift | 45 +- swift/src/Ice/ImplicitContextI.swift | 4 +- swift/src/Ice/IncomingRequest.swift | 1 - swift/src/Ice/InitializationData.swift | 4 +- swift/src/Ice/Initialize.swift | 24 +- swift/src/Ice/InputStream.swift | 4 +- swift/src/Ice/Instrumentation.swift | 89 +-- swift/src/Ice/LocalException.swift | 661 +++++++++--------- swift/src/Ice/LocalExceptionDescription.swift | 4 +- swift/src/Ice/LocalExceptionFactory.swift | 4 +- swift/src/Ice/LocalObject.swift | 4 +- swift/src/Ice/Logger.swift | 43 +- swift/src/Ice/LoggerWrapper.swift | 4 +- swift/src/Ice/Mutex.swift | 4 +- swift/src/Ice/NativePropertiesAdmin.swift | 5 +- swift/src/Ice/Object.swift | 4 +- swift/src/Ice/ObjectAdapter.swift | 65 +- swift/src/Ice/ObjectAdapterI.swift | 4 +- swift/src/Ice/OptionalFormat.swift | 5 +- swift/src/Ice/OutputStream.swift | 4 +- swift/src/Ice/Plugin.swift | 27 +- swift/src/Ice/ProcessI.swift | 6 +- swift/src/Ice/Properties.swift | 87 +-- swift/src/Ice/PropertiesAdminI.swift | 8 +- swift/src/Ice/PropertiesI.swift | 4 +- swift/src/Ice/Proxy.swift | 8 +- swift/src/Ice/SSLConnectionInfo.swift | 4 +- swift/src/Ice/SSLEndpointInfo.swift | 15 +- swift/src/Ice/ServantLocator.swift | 31 +- swift/src/Ice/ServantManager.swift | 4 +- swift/src/Ice/SliceFlags.swift | 4 +- swift/src/Ice/SliceInfo.swift | 4 +- swift/src/Ice/SlicedData.swift | 4 +- swift/src/Ice/ToStringMode.swift | 73 ++ swift/src/Ice/UnknownSlicedValue.swift | 4 +- swift/src/Ice/Util.swift | 4 +- swift/src/Ice/Value.swift | 6 +- swift/src/Ice/ValueFactory.swift | 29 +- swift/src/Ice/ValueFactoryManagerI.swift | 4 +- swift/src/IceGrid/IceGridSwift.h | 5 +- swift/src/IceImpl/AdminFacetFactory.h | 5 +- swift/src/IceImpl/Communicator.h | 5 +- swift/src/IceImpl/Communicator.mm | 5 +- swift/src/IceImpl/Config.h | 5 +- swift/src/IceImpl/Connection.h | 5 +- swift/src/IceImpl/Connection.mm | 5 +- swift/src/IceImpl/Convert.h | 5 +- swift/src/IceImpl/Convert.mm | 5 +- swift/src/IceImpl/DispatchAdapter.h | 1 - swift/src/IceImpl/DispatchAdapter.mm | 1 - swift/src/IceImpl/Endpoint.h | 5 +- swift/src/IceImpl/Endpoint.mm | 5 +- swift/src/IceImpl/Exception.h | 5 +- swift/src/IceImpl/IceUtil.h | 5 +- swift/src/IceImpl/IceUtil.mm | 5 +- swift/src/IceImpl/ImplicitContext.h | 5 +- swift/src/IceImpl/ImplicitContext.mm | 5 +- swift/src/IceImpl/LocalObject.h | 5 +- swift/src/IceImpl/LocalObject.mm | 5 +- swift/src/IceImpl/Logger.h | 5 +- swift/src/IceImpl/Logger.mm | 5 +- swift/src/IceImpl/LoggerWrapperI.h | 5 +- swift/src/IceImpl/ObjectAdapter.h | 5 +- swift/src/IceImpl/ObjectAdapter.mm | 5 +- swift/src/IceImpl/ObjectPrx.h | 5 +- swift/src/IceImpl/ObjectPrx.mm | 5 +- swift/src/IceImpl/OutputStream.h | 5 +- swift/src/IceImpl/Process.h | 5 +- swift/src/IceImpl/Process.mm | 5 +- swift/src/IceImpl/Properties.h | 5 +- swift/src/IceImpl/Properties.mm | 5 +- swift/src/IceImpl/PropertiesAdmin.h | 5 +- swift/src/IceImpl/PropertiesAdmin.mm | 5 +- swift/src/IceImpl/TraceUtil.h | 5 +- swift/src/IceImpl/TraceUtil.mm | 5 +- swift/src/IceImpl/UnsupportedAdminFacet.h | 5 +- swift/src/IceImpl/UnsupportedAdminFacet.mm | 5 +- swift/src/IceStorm/IceStormSwift.h | 5 +- .../Ice/adapterDeactivation/AllTests.swift | 4 +- .../test/Ice/adapterDeactivation/Client.swift | 4 +- .../Ice/adapterDeactivation/Collocated.swift | 4 +- .../test/Ice/adapterDeactivation/Server.swift | 4 +- swift/test/Ice/adapterDeactivation/Test.ice | 5 +- .../test/Ice/adapterDeactivation/TestI.swift | 6 +- swift/test/Ice/admin/AllTests.swift | 4 +- swift/test/Ice/admin/Client.swift | 4 +- swift/test/Ice/admin/Server.swift | 4 +- swift/test/Ice/admin/Test.ice | 5 +- swift/test/Ice/admin/TestI.swift | 4 +- swift/test/Ice/ami/AllTests.swift | 4 +- swift/test/Ice/ami/Client.swift | 4 +- swift/test/Ice/ami/Collocated.swift | 4 +- swift/test/Ice/ami/Server.swift | 4 +- swift/test/Ice/ami/Test.ice | 5 +- swift/test/Ice/ami/TestI.swift | 4 +- swift/test/Ice/binding/AllTests.swift | 5 +- swift/test/Ice/binding/Client.swift | 4 +- swift/test/Ice/binding/Server.swift | 4 +- swift/test/Ice/binding/Test.ice | 5 +- swift/test/Ice/binding/TestI.swift | 4 +- swift/test/Ice/defaultServant/AllTests.swift | 4 +- swift/test/Ice/defaultServant/Client.swift | 4 +- swift/test/Ice/defaultServant/Test.ice | 5 +- swift/test/Ice/defaultValue/AllTests.swift | 4 +- swift/test/Ice/defaultValue/Client.swift | 4 +- swift/test/Ice/defaultValue/Test.ice | 5 +- swift/test/Ice/enums/AllTests.swift | 4 +- swift/test/Ice/enums/Client.swift | 4 +- swift/test/Ice/enums/Server.swift | 4 +- swift/test/Ice/enums/Test.ice | 5 +- swift/test/Ice/enums/TestI.swift | 4 +- swift/test/Ice/exceptions/AllTests.swift | 4 +- swift/test/Ice/exceptions/Client.swift | 4 +- swift/test/Ice/exceptions/Collocated.swift | 4 +- swift/test/Ice/exceptions/Server.swift | 4 +- swift/test/Ice/exceptions/ServerAMD.swift | 4 +- swift/test/Ice/exceptions/Test.ice | 5 +- swift/test/Ice/exceptions/TestAMD.ice | 5 +- swift/test/Ice/exceptions/TestAMDI.swift | 4 +- swift/test/Ice/exceptions/TestI.swift | 4 +- swift/test/Ice/facets/AllTests.swift | 4 +- swift/test/Ice/facets/Client.swift | 4 +- swift/test/Ice/facets/Collocated.swift | 4 +- swift/test/Ice/facets/Server.swift | 4 +- swift/test/Ice/facets/Test.ice | 5 +- swift/test/Ice/facets/TestI.swift | 4 +- swift/test/Ice/hold/AllTests.swift | 4 +- swift/test/Ice/hold/Client.swift | 4 +- swift/test/Ice/hold/Server.swift | 4 +- swift/test/Ice/hold/Test.ice | 5 +- swift/test/Ice/hold/TestI.swift | 4 +- swift/test/Ice/info/AllTests.swift | 4 +- swift/test/Ice/info/Client.swift | 4 +- swift/test/Ice/info/Server.swift | 4 +- swift/test/Ice/info/Test.ice | 5 +- swift/test/Ice/info/TestI.swift | 4 +- swift/test/Ice/inheritance/AllTests.swift | 4 +- swift/test/Ice/inheritance/Client.swift | 4 +- swift/test/Ice/inheritance/Collocated.swift | 4 +- swift/test/Ice/inheritance/Server.swift | 4 +- swift/test/Ice/inheritance/Test.ice | 5 +- swift/test/Ice/inheritance/TestI.swift | 4 +- swift/test/Ice/invoke/AllTests.swift | 4 +- swift/test/Ice/invoke/Client.swift | 4 +- swift/test/Ice/invoke/Server.swift | 4 +- swift/test/Ice/invoke/Test.ice | 5 +- swift/test/Ice/invoke/TestI.swift | 4 +- swift/test/Ice/location/AllTests.swift | 4 +- swift/test/Ice/location/Client.swift | 4 +- swift/test/Ice/location/Server.swift | 4 +- swift/test/Ice/location/Test.ice | 5 +- swift/test/Ice/location/TestI.swift | 5 +- swift/test/Ice/objects/AllTests.swift | 4 +- swift/test/Ice/objects/Client.swift | 4 +- swift/test/Ice/objects/Collocated.swift | 4 +- swift/test/Ice/objects/Derived.ice | 5 +- swift/test/Ice/objects/DerivedEx.ice | 5 +- swift/test/Ice/objects/Forward.ice | 5 +- swift/test/Ice/objects/II.swift | 5 +- swift/test/Ice/objects/Server.swift | 4 +- swift/test/Ice/objects/Test.ice | 5 +- swift/test/Ice/objects/TestI.swift | 4 +- swift/test/Ice/operations/AllTests.swift | 4 +- swift/test/Ice/operations/BatchOneways.swift | 4 +- .../test/Ice/operations/BatchOnewaysAMI.swift | 4 +- swift/test/Ice/operations/Client.swift | 4 +- swift/test/Ice/operations/Collocated.swift | 4 +- swift/test/Ice/operations/Oneways.swift | 4 +- swift/test/Ice/operations/OnewaysAMI.swift | 4 +- swift/test/Ice/operations/Server.swift | 4 +- swift/test/Ice/operations/ServerAMD.swift | 4 +- swift/test/Ice/operations/Test.ice | 5 +- swift/test/Ice/operations/TestAMD.ice | 5 +- swift/test/Ice/operations/TestAMDI.swift | 4 +- swift/test/Ice/operations/TestI.swift | 4 +- swift/test/Ice/operations/Twoways.swift | 4 +- swift/test/Ice/operations/TwowaysAMI.swift | 4 +- swift/test/Ice/optional/AllTests.swift | 4 +- swift/test/Ice/optional/Client.swift | 4 +- swift/test/Ice/optional/Server.swift | 4 +- swift/test/Ice/optional/ServerAMD.swift | 4 +- swift/test/Ice/optional/Test.ice | 5 +- swift/test/Ice/optional/TestAMD.ice | 5 +- swift/test/Ice/optional/TestAMDI.swift | 4 +- swift/test/Ice/optional/TestI.swift | 4 +- swift/test/Ice/properties/Client.swift | 4 +- swift/test/Ice/proxy/AllTests.swift | 4 +- swift/test/Ice/proxy/Client.swift | 4 +- swift/test/Ice/proxy/Collocated.swift | 4 +- swift/test/Ice/proxy/Server.swift | 4 +- swift/test/Ice/proxy/ServerAMD.swift | 4 +- swift/test/Ice/proxy/Test.ice | 5 +- swift/test/Ice/proxy/TestAMD.ice | 5 +- swift/test/Ice/proxy/TestAMDI.swift | 5 +- swift/test/Ice/proxy/TestI.swift | 5 +- swift/test/Ice/retry/AllTests.swift | 4 +- swift/test/Ice/retry/Client.swift | 4 +- swift/test/Ice/retry/Collocated.swift | 4 +- swift/test/Ice/retry/Server.swift | 4 +- swift/test/Ice/retry/Test.ice | 5 +- swift/test/Ice/retry/TestI.swift | 4 +- swift/test/Ice/scope/AllTests.swift | 4 +- swift/test/Ice/scope/Client.swift | 4 +- swift/test/Ice/scope/Server.swift | 4 +- swift/test/Ice/scope/Test.ice | 5 +- swift/test/Ice/scope/TestI.swift | 4 +- swift/test/Ice/servantLocator/AllTests.swift | 4 +- swift/test/Ice/servantLocator/Client.swift | 4 +- .../test/Ice/servantLocator/Collocated.swift | 4 +- .../Ice/servantLocator/ServantLocatorI.swift | 4 +- swift/test/Ice/servantLocator/Server.swift | 4 +- swift/test/Ice/servantLocator/ServerAMD.swift | 4 +- swift/test/Ice/servantLocator/Test.ice | 5 +- swift/test/Ice/servantLocator/TestAMD.ice | 5 +- swift/test/Ice/servantLocator/TestAMDI.swift | 5 +- swift/test/Ice/servantLocator/TestI.swift | 4 +- swift/test/Ice/services/Client.swift | 4 +- .../Ice/slicing/exceptions/AllTests.swift | 4 +- .../test/Ice/slicing/exceptions/Client.swift | 4 +- .../test/Ice/slicing/exceptions/Server.swift | 4 +- .../Ice/slicing/exceptions/ServerAMD.swift | 4 +- .../Ice/slicing/exceptions/ServerPrivate.ice | 5 +- .../slicing/exceptions/ServerPrivateAMD.ice | 5 +- swift/test/Ice/slicing/exceptions/Test.ice | 5 +- swift/test/Ice/slicing/exceptions/TestAMD.ice | 5 +- .../Ice/slicing/exceptions/TestAMDI.swift | 4 +- swift/test/Ice/slicing/exceptions/TestI.swift | 4 +- swift/test/Ice/slicing/objects/AllTests.swift | 4 +- swift/test/Ice/slicing/objects/Client.swift | 4 +- .../Ice/slicing/objects/ClientPrivate.ice | 5 +- swift/test/Ice/slicing/objects/Server.swift | 4 +- .../test/Ice/slicing/objects/ServerAMD.swift | 4 +- .../Ice/slicing/objects/ServerPrivate.ice | 5 +- .../Ice/slicing/objects/ServerPrivateAMD.ice | 5 +- swift/test/Ice/slicing/objects/Test.ice | 5 +- swift/test/Ice/slicing/objects/TestAMD.ice | 5 +- swift/test/Ice/slicing/objects/TestAMDI.swift | 4 +- swift/test/Ice/slicing/objects/TestI.swift | 4 +- swift/test/Ice/stream/Client.swift | 4 +- swift/test/Ice/stream/Test.ice | 5 +- swift/test/Ice/timeout/AllTests.swift | 4 +- swift/test/Ice/timeout/Client.swift | 4 +- swift/test/Ice/timeout/Server.swift | 4 +- swift/test/Ice/timeout/Test.ice | 5 +- swift/test/Ice/udp/AllTests.swift | 4 +- swift/test/Ice/udp/Client.swift | 4 +- swift/test/Ice/udp/Server.swift | 4 +- swift/test/Ice/udp/Test.ice | 5 +- swift/test/Ice/udp/TestI.swift | 4 +- .../test/IceSSL/configuration/AllTests.swift | 4 +- swift/test/IceSSL/configuration/Client.swift | 4 +- swift/test/IceSSL/configuration/Server.swift | 4 +- swift/test/IceSSL/configuration/Test.ice | 5 +- swift/test/IceSSL/configuration/TestI.swift | 4 +- swift/test/Slice/escape/Clash.ice | 5 +- swift/test/Slice/escape/Client.swift | 4 +- swift/test/Slice/escape/Key.ice | 5 +- swift/test/TestCommon/TestCommon.swift | 4 +- swift/test/TestDriver/iOS/AppDelegate.swift | 4 +- swift/test/TestDriver/iOS/ControllerI.swift | 4 +- .../test/TestDriver/iOS/ViewController.swift | 4 +- swift/test/TestDriver/macOS/main.swift | 4 +- 282 files changed, 947 insertions(+), 1768 deletions(-) create mode 100644 swift/src/Ice/ToStringMode.swift diff --git a/swift/src/Glacier2/Glacier2Swift.h b/swift/src/Glacier2/Glacier2Swift.h index 491f3945e88..ae2be8c02f3 100644 --- a/swift/src/Glacier2/Glacier2Swift.h +++ b/swift/src/Glacier2/Glacier2Swift.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import FOUNDATION_EXPORT double Glacier2VersionNumber; diff --git a/swift/src/Ice/Blobject.swift b/swift/src/Ice/Blobject.swift index 09f7b729f47..568cf1debf3 100644 --- a/swift/src/Ice/Blobject.swift +++ b/swift/src/Ice/Blobject.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import PromiseKit diff --git a/swift/src/Ice/BlobjectAsync.swift b/swift/src/Ice/BlobjectAsync.swift index 098e6a06cf4..dccfcb4dabc 100644 --- a/swift/src/Ice/BlobjectAsync.swift +++ b/swift/src/Ice/BlobjectAsync.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import PromiseKit diff --git a/swift/src/Ice/ClassResolver.swift b/swift/src/Ice/ClassResolver.swift index a73587af26c..7b588d5a67a 100644 --- a/swift/src/Ice/ClassResolver.swift +++ b/swift/src/Ice/ClassResolver.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/Communicator.swift b/swift/src/Ice/Communicator.swift index 63c28cda9fb..da64bbaefb0 100644 --- a/swift/src/Ice/Communicator.swift +++ b/swift/src/Ice/Communicator.swift @@ -1,93 +1,11 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Communicator.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation import PromiseKit -/// The output mode for xxxToString method such as identityToString and proxyToString. The actual encoding format for -/// the string is the same for all modes: you don't need to specify an encoding format or mode when reading such a -/// string. -public enum ToStringMode: Swift.UInt8 { - /// Unicode Characters with ordinal values greater than 127 are kept as-is in the resulting string. Non-printable - /// ASCII characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. - case Unicode = 0 - /// ASCII Characters with ordinal values greater than 127 are encoded as universal character names in the resulting - /// string: \\unnnn for BMP characters and \\Unnnnnnnn for non-BMP characters. Non-printable ASCII characters - /// with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. - case ASCII = 1 - /// Compat Characters with ordinal values greater than 127 are encoded as a sequence of UTF-8 bytes using octal - /// escapes. - /// Characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or an octal escape. Use this mode - /// to generate strings compatible with Ice 3.6 and earlier. - case Compat = 2 - public init() { - self = .Unicode - } -} - -/// An `Ice.InputStream` extension to read `ToStringMode` enumerated values from the stream. -extension InputStream { - /// Read an enumerated value. - /// - /// - returns: `ToStringMode` - The enumarated value. - public func read() throws -> ToStringMode { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) - guard let val = ToStringMode(rawValue: rawValue) else { - throw MarshalException(reason: "invalid enum value") - } - return val - } - - /// Read an optional enumerated value from the stream. - /// - /// - parameter tag: `Int32` - The numeric tag associated with the value. - /// - /// - returns: `ToStringMode` - The enumerated value. - public func read(tag: Swift.Int32) throws -> ToStringMode? { - guard try readOptional(tag: tag, expectedFormat: .Size) else { - return nil - } - return try read() as ToStringMode - } -} - -/// An `Ice.OutputStream` extension to write `ToStringMode` enumerated values to the stream. -extension OutputStream { - /// Writes an enumerated value to the stream. - /// - /// parameter _: `ToStringMode` - The enumerator to write. - public func write(_ v: ToStringMode) { - write(enum: v.rawValue, maxValue: 2) - } - - /// Writes an optional enumerated value to the stream. - /// - /// parameter tag: `Int32` - The numeric tag associated with the value. - /// - /// parameter _: `ToStringMode` - The enumerator to write. - public func write(tag: Swift.Int32, value: ToStringMode?) { - guard let v = value else { - return - } - write(tag: tag, val: v.rawValue, maxValue: 2) - } -} - /// The central object in Ice. One or more communicators can be instantiated for an Ice application. Communicator /// instantiation is language-specific, and not specified in Slice code. -public protocol Communicator: Swift.AnyObject { +public protocol Communicator: AnyObject { /// Destroy the communicator. This operation calls shutdown implicitly. Calling destroy cleans up /// memory, and shuts down this communicator's client functionality and destroys all object adapters. Subsequent /// calls to destroy are ignored. @@ -111,8 +29,8 @@ public protocol Communicator: Swift.AnyObject { /// Check whether communicator has been shut down. /// - /// - returns: `Swift.Bool` - True if the communicator has been shut down; false otherwise. - func isShutdown() -> Swift.Bool + /// - returns: `Bool` - True if the communicator has been shut down; false otherwise. + func isShutdown() -> Bool /// Convert a stringified proxy into a proxy. /// For example, MyCategory/MyObject:tcp -h some_host -p 10000 creates a proxy that refers to the Ice @@ -121,44 +39,44 @@ public protocol Communicator: Swift.AnyObject { /// ProxyParseException, EndpointParseException, or IdentityParseException. Refer to the Ice manual for a detailed /// description of the syntax supported by stringified proxies. /// - /// - parameter _: `Swift.String` The stringified proxy to convert into a proxy. + /// - parameter _: `String` The stringified proxy to convert into a proxy. /// /// - returns: `ObjectPrx?` - The proxy, or nil if str is an empty string. - func stringToProxy(_ str: Swift.String) throws -> ObjectPrx? + func stringToProxy(_ str: String) throws -> ObjectPrx? /// Convert a proxy into a string. /// /// - parameter _: `ObjectPrx?` The proxy to convert into a stringified proxy. /// - /// - returns: `Swift.String` - The stringified proxy, or an empty string if + /// - returns: `String` - The stringified proxy, or an empty string if /// obj is nil. - func proxyToString(_ obj: ObjectPrx?) -> Swift.String + func proxyToString(_ obj: ObjectPrx?) -> String /// Convert a set of proxy properties into a proxy. The "base" name supplied in the property argument /// refers to a property containing a stringified proxy, such as MyProxy=id:tcp -h localhost -p 10000. /// Additional properties configure local settings for the proxy, such as MyProxy.PreferSecure=1. The /// "Properties" appendix in the Ice manual describes each of the supported proxy properties. /// - /// - parameter _: `Swift.String` The base property name. + /// - parameter _: `String` The base property name. /// /// - returns: `ObjectPrx?` - The proxy. - func propertyToProxy(_ property: Swift.String) throws -> ObjectPrx? + func propertyToProxy(_ property: String) throws -> ObjectPrx? /// Convert a proxy to a set of proxy properties. /// /// - parameter proxy: `ObjectPrx` The proxy. /// - /// - parameter property: `Swift.String` The base property name. + /// - parameter property: `String` The base property name. /// /// - returns: `PropertyDict` - The property set. - func proxyToProperty(proxy: ObjectPrx, property: Swift.String) -> PropertyDict + func proxyToProperty(proxy: ObjectPrx, property: String) -> PropertyDict /// Convert an identity into a string. /// /// - parameter _: `Identity` The identity to convert into a string. /// - /// - returns: `Swift.String` - The "stringified" identity. - func identityToString(_ ident: Identity) -> Swift.String + /// - returns: `String` - The "stringified" identity. + func identityToString(_ ident: Identity) -> String /// Create a new object adapter. The endpoints for the object adapter are taken from the property /// name.Endpoints. @@ -167,33 +85,33 @@ public protocol Communicator: Swift.AnyObject { /// by the adapter. Attempts to create a named object adapter for which no configuration can be found raise /// InitializationException. /// - /// - parameter _: `Swift.String` The object adapter name. + /// - parameter _: `String` The object adapter name. /// /// - returns: `ObjectAdapter` - The new object adapter. - func createObjectAdapter(_ name: Swift.String) throws -> ObjectAdapter + func createObjectAdapter(_ name: String) throws -> ObjectAdapter /// Create a new object adapter with endpoints. This operation sets the property /// name.Endpoints, and then calls createObjectAdapter. It is provided as a /// convenience function. Calling this operation with an empty name will result in a UUID being generated for the /// name. /// - /// - parameter name: `Swift.String` The object adapter name. + /// - parameter name: `String` The object adapter name. /// - /// - parameter endpoints: `Swift.String` The endpoints for the object adapter. + /// - parameter endpoints: `String` The endpoints for the object adapter. /// /// - returns: `ObjectAdapter` - The new object adapter. - func createObjectAdapterWithEndpoints(name: Swift.String, endpoints: Swift.String) throws + func createObjectAdapterWithEndpoints(name: String, endpoints: String) throws -> ObjectAdapter /// Create a new object adapter with a router. This operation creates a routed object adapter. /// Calling this operation with an empty name will result in a UUID being generated for the name. /// - /// - parameter name: `Swift.String` The object adapter name. + /// - parameter name: `String` The object adapter name. /// /// - parameter rtr: `RouterPrx` The router. /// /// - returns: `ObjectAdapter` - The new object adapter. - func createObjectAdapterWithRouter(name: Swift.String, rtr: RouterPrx) throws -> ObjectAdapter + func createObjectAdapterWithRouter(name: String, rtr: RouterPrx) throws -> ObjectAdapter /// Get the implicit context associated with this communicator. /// @@ -265,15 +183,15 @@ public protocol Communicator: Swift.AnyObject { /// - parameter sentFlags: `Dispatch.DispatchWorkItemFlags?` - Optional dispatch flags used /// to dispatch the sent callback /// - /// - parameter sent: `((Swift.Bool) -> Swift.Void)` - Optional sent callback. + /// - parameter sent: `((Bool) -> Void)` - Optional sent callback. /// /// - returns: `PromiseKit.Promise<>` - The result of the operation func flushBatchRequestsAsync( _ compress: CompressBatch, sentOn: Dispatch.DispatchQueue?, sentFlags: Dispatch.DispatchWorkItemFlags?, - sent: ((Swift.Bool) -> Swift.Void)? - ) -> PromiseKit.Promise + sent: ((Bool) -> Void)? + ) -> PromiseKit.Promise /// Add the Admin object with all its facets to the provided object adapter. If Ice.Admin.ServerId is /// set and the provided object adapter has a Locator, createAdmin registers the Admin's Process facet with @@ -303,25 +221,25 @@ public protocol Communicator: Swift.AnyObject { /// /// - parameter servant: `Dispatcher` The servant that implements the new Admin facet. /// - /// - parameter facet: `Swift.String` The name of the new Admin facet. - func addAdminFacet(servant: Dispatcher, facet: Swift.String) throws + /// - parameter facet: `String` The name of the new Admin facet. + func addAdminFacet(servant: Dispatcher, facet: String) throws /// Remove the following facet to the Admin object. Removing a facet that was not previously registered throws /// NotRegisteredException. /// - /// - parameter _: `Swift.String` The name of the Admin facet. + /// - parameter _: `String` The name of the Admin facet. /// /// - returns: `Dispatcher` - The servant associated with this Admin facet. @discardableResult - func removeAdminFacet(_ facet: Swift.String) throws -> Dispatcher + func removeAdminFacet(_ facet: String) throws -> Dispatcher /// Returns a facet of the Admin object. /// - /// - parameter _: `Swift.String` The name of the Admin facet. + /// - parameter _: `String` The name of the Admin facet. /// /// - returns: `Dispatcher?` - The servant associated with this Admin facet, or null if no facet is registered with the /// given name. - func findAdminFacet(_ facet: Swift.String) -> Dispatcher? + func findAdminFacet(_ facet: String) -> Dispatcher? /// Returns a map of all facets of the Admin object. /// diff --git a/swift/src/Ice/CommunicatorI.swift b/swift/src/Ice/CommunicatorI.swift index ae49337de98..42bb6e63c73 100644 --- a/swift/src/Ice/CommunicatorI.swift +++ b/swift/src/Ice/CommunicatorI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl import PromiseKit diff --git a/swift/src/Ice/Connection.swift b/swift/src/Ice/Connection.swift index 84bbaa6ec6f..1eafc91166a 100644 --- a/swift/src/Ice/Connection.swift +++ b/swift/src/Ice/Connection.swift @@ -1,23 +1,10 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Connection.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation import PromiseKit /// The batch compression option when flushing queued batch requests. -public enum CompressBatch: Swift.UInt8 { +public enum CompressBatch: UInt8 { /// Yes Compress the batch requests. case Yes = 0 /// No Don't compress the batch requests. @@ -33,9 +20,9 @@ public enum CompressBatch: Swift.UInt8 { extension InputStream { /// Read an enumerated value. /// - /// - returns: `CompressBatch` - The enumarated value. + /// - returns: `CompressBatch` - The enumerated value. public func read() throws -> CompressBatch { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) + let rawValue: UInt8 = try read(enumMaxValue: 2) guard let val = CompressBatch(rawValue: rawValue) else { throw MarshalException(reason: "invalid enum value") } @@ -47,7 +34,7 @@ extension InputStream { /// - parameter tag: `Int32` - The numeric tag associated with the value. /// /// - returns: `CompressBatch` - The enumerated value. - public func read(tag: Swift.Int32) throws -> CompressBatch? { + public func read(tag: Int32) throws -> CompressBatch? { guard try readOptional(tag: tag, expectedFormat: .Size) else { return nil } @@ -69,7 +56,7 @@ extension OutputStream { /// parameter tag: `Int32` - The numeric tag associated with the value. /// /// parameter _: `CompressBatch` - The enumerator to write. - public func write(tag: Swift.Int32, value: CompressBatch?) { + public func write(tag: Int32, value: CompressBatch?) { guard let v = value else { return } @@ -78,7 +65,7 @@ extension OutputStream { } /// Determines the behavior when manually closing a connection. -public enum ConnectionClose: Swift.UInt8 { +public enum ConnectionClose: UInt8 { /// Forcefully Close the connection immediately without sending a close connection protocol message to the peer /// and waiting for the peer to acknowledge it. case Forcefully = 0 @@ -98,7 +85,7 @@ extension InputStream { /// /// - returns: `ConnectionClose` - The enumarated value. public func read() throws -> ConnectionClose { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) + let rawValue: UInt8 = try read(enumMaxValue: 2) guard let val = ConnectionClose(rawValue: rawValue) else { throw MarshalException(reason: "invalid enum value") } @@ -110,7 +97,7 @@ extension InputStream { /// - parameter tag: `Int32` - The numeric tag associated with the value. /// /// - returns: `ConnectionClose` - The enumerated value. - public func read(tag: Swift.Int32) throws -> ConnectionClose? { + public func read(tag: Int32) throws -> ConnectionClose? { guard try readOptional(tag: tag, expectedFormat: .Size) else { return nil } @@ -132,7 +119,7 @@ extension OutputStream { /// parameter tag: `Int32` - The numeric tag associated with the value. /// /// parameter _: `ConnectionClose` - The enumerator to write. - public func write(tag: Swift.Int32, value: ConnectionClose?) { + public func write(tag: Int32, value: ConnectionClose?) { guard let v = value else { return } @@ -141,18 +128,18 @@ extension OutputStream { } /// A collection of HTTP headers. -public typealias HeaderDict = [Swift.String: Swift.String] +public typealias HeaderDict = [String: String] /// Base class providing access to the connection details. -public protocol ConnectionInfo: Swift.AnyObject { +public protocol ConnectionInfo: AnyObject { /// The information of the underyling transport or null if there's no underlying transport. var underlying: ConnectionInfo? { get set } /// Whether or not the connection is an incoming or outgoing connection. - var incoming: Swift.Bool { get set } + var incoming: Bool { get set } /// The name of the adapter associated with the connection. - var adapterName: Swift.String { get set } + var adapterName: String { get set } /// The connection id. - var connectionId: Swift.String { get set } + var connectionId: String { get set } } /// An application can implement this interface to receive notifications when a connection closes. @@ -161,7 +148,7 @@ public protocol ConnectionInfo: Swift.AnyObject { /// about the closure, it can call Connection.throwException. /// /// - parameter _: `Connection?` The connection that closed. -public typealias CloseCallback = (Connection?) -> Swift.Void +public typealias CloseCallback = (Connection?) -> Void /// An application can implement this interface to receive notifications when a connection receives a heartbeat /// message. @@ -169,10 +156,10 @@ public typealias CloseCallback = (Connection?) -> Swift.Void /// This method is called by the connection when a heartbeat is received from the peer. /// /// - parameter _: `Connection?` The connection on which a heartbeat was received. -public typealias HeartbeatCallback = (Connection?) -> Swift.Void +public typealias HeartbeatCallback = (Connection?) -> Void /// The user-level interface to a connection. -public protocol Connection: Swift.AnyObject, Swift.CustomStringConvertible { +public protocol Connection: AnyObject, CustomStringConvertible { /// Manually close the connection using the specified closure mode. /// /// - parameter _: `ConnectionClose` Determines how the connection will be closed. @@ -227,15 +214,15 @@ public protocol Connection: Swift.AnyObject, Swift.CustomStringConvertible { /// - parameter sentFlags: `Dispatch.DispatchWorkItemFlags?` - Optional dispatch flags used /// to dispatch the sent callback /// - /// - parameter sent: `((Swift.Bool) -> Swift.Void)` - Optional sent callback. + /// - parameter sent: `((Bool) -> Void)` - Optional sent callback. /// /// - returns: `PromiseKit.Promise<>` - The result of the operation func flushBatchRequestsAsync( _ compress: CompressBatch, sentOn: Dispatch.DispatchQueue?, sentFlags: Dispatch.DispatchWorkItemFlags?, - sent: ((Swift.Bool) -> Swift.Void)? - ) -> PromiseKit.Promise + sent: ((Bool) -> Void)? + ) -> PromiseKit.Promise /// Set a close callback on the connection. The callback is called by the connection when it's closed. The callback /// is called from the Ice thread pool associated with the connection. If the callback needs more information about @@ -261,24 +248,24 @@ public protocol Connection: Swift.AnyObject, Swift.CustomStringConvertible { /// - parameter sentFlags: `Dispatch.DispatchWorkItemFlags?` - Optional dispatch flags used /// to dispatch the sent callback /// - /// - parameter sent: `((Swift.Bool) -> Swift.Void)` - Optional sent callback. + /// - parameter sent: `((Bool) -> Void)` - Optional sent callback. /// /// - returns: `PromiseKit.Promise<>` - The result of the operation func heartbeatAsync( sentOn: Dispatch.DispatchQueue?, sentFlags: Dispatch.DispatchWorkItemFlags?, - sent: ((Swift.Bool) -> Swift.Void)? - ) -> PromiseKit.Promise + sent: ((Bool) -> Void)? + ) -> PromiseKit.Promise /// Return the connection type. This corresponds to the endpoint type, i.e., "tcp", "udp", etc. /// - /// - returns: `Swift.String` - The type of the connection. - func type() -> Swift.String + /// - returns: `String` - The type of the connection. + func type() -> String /// Return a description of the connection as human readable text, suitable for logging or error messages. /// - /// - returns: `Swift.String` - The description of the connection as human readable text. - func toString() -> Swift.String + /// - returns: `String` - The description of the connection as human readable text. + func toString() -> String /// Returns the connection information. /// @@ -287,10 +274,10 @@ public protocol Connection: Swift.AnyObject, Swift.CustomStringConvertible { /// Set the connection buffer receive/send size. /// - /// - parameter rcvSize: `Swift.Int32` The connection receive buffer size. + /// - parameter rcvSize: `Int32` The connection receive buffer size. /// - /// - parameter sndSize: `Swift.Int32` The connection send buffer size. - func setBufferSize(rcvSize: Swift.Int32, sndSize: Swift.Int32) throws + /// - parameter sndSize: `Int32` The connection send buffer size. + func setBufferSize(rcvSize: Int32, sndSize: Int32) throws /// Throw an exception indicating the reason for connection closure. For example, /// CloseConnectionException is raised if the connection was closed gracefully, whereas @@ -302,33 +289,33 @@ public protocol Connection: Swift.AnyObject, Swift.CustomStringConvertible { /// Provides access to the connection details of an IP connection public protocol IPConnectionInfo: ConnectionInfo { /// The local address. - var localAddress: Swift.String { get set } + var localAddress: String { get set } /// The local port. - var localPort: Swift.Int32 { get set } + var localPort: Int32 { get set } /// The remote address. - var remoteAddress: Swift.String { get set } + var remoteAddress: String { get set } /// The remote port. - var remotePort: Swift.Int32 { get set } + var remotePort: Int32 { get set } } /// Provides access to the connection details of a TCP connection public protocol TCPConnectionInfo: IPConnectionInfo { /// The connection buffer receive size. - var rcvSize: Swift.Int32 { get set } + var rcvSize: Int32 { get set } /// The connection buffer send size. - var sndSize: Swift.Int32 { get set } + var sndSize: Int32 { get set } } /// Provides access to the connection details of a UDP connection public protocol UDPConnectionInfo: IPConnectionInfo { /// The multicast address. - var mcastAddress: Swift.String { get set } + var mcastAddress: String { get set } /// The multicast port. - var mcastPort: Swift.Int32 { get set } + var mcastPort: Int32 { get set } /// The connection buffer receive size. - var rcvSize: Swift.Int32 { get set } + var rcvSize: Int32 { get set } /// The connection buffer send size. - var sndSize: Swift.Int32 { get set } + var sndSize: Int32 { get set } } /// Provides access to the connection details of a WebSocket connection diff --git a/swift/src/Ice/ConnectionI.swift b/swift/src/Ice/ConnectionI.swift index eaeb4c7f2c8..a701aeb07e5 100644 --- a/swift/src/Ice/ConnectionI.swift +++ b/swift/src/Ice/ConnectionI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl import PromiseKit diff --git a/swift/src/Ice/ConnectionInfoFactory.swift b/swift/src/Ice/ConnectionInfoFactory.swift index e1e35ec17b2..75a3af0d743 100644 --- a/swift/src/Ice/ConnectionInfoFactory.swift +++ b/swift/src/Ice/ConnectionInfoFactory.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import IceImpl diff --git a/swift/src/Ice/Current.swift b/swift/src/Ice/Current.swift index e6567e4f4ff..a8a3dce44db 100644 --- a/swift/src/Ice/Current.swift +++ b/swift/src/Ice/Current.swift @@ -1,4 +1,4 @@ -// Copyright (c) ZeroC, Inc. All rights reserved. +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/Endpoint.swift b/swift/src/Ice/Endpoint.swift index 8a0b29a25df..833815eb0c7 100644 --- a/swift/src/Ice/Endpoint.swift +++ b/swift/src/Ice/Endpoint.swift @@ -1,50 +1,37 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Endpoint.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// Base class providing access to the endpoint details. -public protocol EndpointInfo: Swift.AnyObject { +public protocol EndpointInfo: AnyObject { /// The information of the underyling endpoint or null if there's no underlying endpoint. var underlying: EndpointInfo? { get set } /// The timeout for the endpoint in milliseconds. 0 means non-blocking, -1 means no timeout. - var timeout: Swift.Int32 { get set } + var timeout: Int32 { get set } /// Specifies whether or not compression should be used if available when using this endpoint. - var compress: Swift.Bool { get set } + var compress: Bool { get set } /// Returns the type of the endpoint. /// - /// - returns: `Swift.Int16` - The endpoint type. - func type() -> Swift.Int16 + /// - returns: `Int16` - The endpoint type. + func type() -> Int16 /// Returns true if this endpoint is a datagram endpoint. /// - /// - returns: `Swift.Bool` - True for a datagram endpoint. - func datagram() -> Swift.Bool + /// - returns: `Bool` - True for a datagram endpoint. + func datagram() -> Bool /// - /// - returns: `Swift.Bool` - True for a secure endpoint. - func secure() -> Swift.Bool + /// - returns: `Bool` - True for a secure endpoint. + func secure() -> Bool } /// The user-level interface to an endpoint. -public protocol Endpoint: Swift.AnyObject, Swift.CustomStringConvertible { +public protocol Endpoint: AnyObject, CustomStringConvertible { /// Return a string representation of the endpoint. /// - /// - returns: `Swift.String` - The string representation of the endpoint. - func toString() -> Swift.String + /// - returns: `String` - The string representation of the endpoint. + func toString() -> String /// Returns the endpoint information. /// @@ -55,11 +42,11 @@ public protocol Endpoint: Swift.AnyObject, Swift.CustomStringConvertible { /// Provides access to the address details of a IP endpoint. public protocol IPEndpointInfo: EndpointInfo { /// The host or address configured with the endpoint. - var host: Swift.String { get set } + var host: String { get set } /// The port number. - var port: Swift.Int32 { get set } + var port: Int32 { get set } /// The source IP address. - var sourceAddress: Swift.String { get set } + var sourceAddress: String { get set } } /// Provides access to a TCP endpoint information. @@ -68,15 +55,15 @@ public protocol TCPEndpointInfo: IPEndpointInfo {} /// Provides access to an UDP endpoint information. public protocol UDPEndpointInfo: IPEndpointInfo { /// The multicast interface. - var mcastInterface: Swift.String { get set } + var mcastInterface: String { get set } /// The multicast time-to-live (or hops). - var mcastTtl: Swift.Int32 { get set } + var mcastTtl: Int32 { get set } } /// Provides access to a WebSocket endpoint information. public protocol WSEndpointInfo: EndpointInfo { /// The URI configured with the endpoint. - var resource: Swift.String { get set } + var resource: String { get set } } /// Provides access to the details of an opaque endpoint. diff --git a/swift/src/Ice/EndpointI.swift b/swift/src/Ice/EndpointI.swift index 136ece4ee28..56c3a3af2f4 100644 --- a/swift/src/Ice/EndpointI.swift +++ b/swift/src/Ice/EndpointI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/EndpointInfoFactory.swift b/swift/src/Ice/EndpointInfoFactory.swift index d460d34d948..24e6c0c4bfe 100644 --- a/swift/src/Ice/EndpointInfoFactory.swift +++ b/swift/src/Ice/EndpointInfoFactory.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/EndpointSelectionType.swift b/swift/src/Ice/EndpointSelectionType.swift index e9c006d9518..e0f224fadb7 100644 --- a/swift/src/Ice/EndpointSelectionType.swift +++ b/swift/src/Ice/EndpointSelectionType.swift @@ -1,22 +1,9 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `EndpointSelectionType.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// Determines the order in which the Ice run time uses the endpoints in a proxy when establishing a connection. -public enum EndpointSelectionType: Swift.UInt8 { +public enum EndpointSelectionType: UInt8 { /// Random Random causes the endpoints to be arranged in a random order. case Random = 0 /// Ordered Ordered forces the Ice run time to use the endpoints in the order they appeared in the proxy. @@ -32,7 +19,7 @@ extension InputStream { /// /// - returns: `EndpointSelectionType` - The enumarated value. public func read() throws -> EndpointSelectionType { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 1) + let rawValue: UInt8 = try read(enumMaxValue: 1) guard let val = EndpointSelectionType(rawValue: rawValue) else { throw MarshalException(reason: "invalid enum value") } @@ -44,7 +31,7 @@ extension InputStream { /// - parameter tag: `Int32` - The numeric tag associated with the value. /// /// - returns: `EndpointSelectionType` - The enumerated value. - public func read(tag: Swift.Int32) throws -> EndpointSelectionType? { + public func read(tag: Int32) throws -> EndpointSelectionType? { guard try readOptional(tag: tag, expectedFormat: .Size) else { return nil } @@ -66,7 +53,7 @@ extension OutputStream { /// parameter tag: `Int32` - The numeric tag associated with the value. /// /// parameter _: `EndpointSelectionType` - The enumerator to write. - public func write(tag: Swift.Int32, value: EndpointSelectionType?) { + public func write(tag: Int32, value: EndpointSelectionType?) { guard let v = value else { return } diff --git a/swift/src/Ice/Exception.swift b/swift/src/Ice/Exception.swift index f971d593f5d..4a9bb4c8993 100644 --- a/swift/src/Ice/Exception.swift +++ b/swift/src/Ice/Exception.swift @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. /// Base protocol for Ice exceptions. public protocol Exception: Error { /// Returns the type id of this exception. diff --git a/swift/src/Ice/FacetMap.swift b/swift/src/Ice/FacetMap.swift index 259236d649d..a7252d1e44a 100644 --- a/swift/src/Ice/FacetMap.swift +++ b/swift/src/Ice/FacetMap.swift @@ -1,19 +1,6 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `FacetMap.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// A mapping from facet name to servant. -public typealias FacetMap = [Swift.String: Dispatcher] +public typealias FacetMap = [String: Dispatcher] diff --git a/swift/src/Ice/FormatType.swift b/swift/src/Ice/FormatType.swift index 0104a77efc8..0fc3916d236 100644 --- a/swift/src/Ice/FormatType.swift +++ b/swift/src/Ice/FormatType.swift @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. /// This enumeration describes the possible formats for classes and exceptions. public enum FormatType: UInt8 { case DefaultFormat = 0 diff --git a/swift/src/Ice/IAPConnectionInfo.swift b/swift/src/Ice/IAPConnectionInfo.swift index f43141d085b..f16bd7f0b75 100644 --- a/swift/src/Ice/IAPConnectionInfo.swift +++ b/swift/src/Ice/IAPConnectionInfo.swift @@ -1,32 +1,19 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `ConnectionInfo.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// Provides access to the connection details of an IAP connection. public protocol IAPConnectionInfo: ConnectionInfo { /// The accessory name. - var name: Swift.String { get set } + var name: String { get set } /// The accessory manufacturer. - var manufacturer: Swift.String { get set } + var manufacturer: String { get set } /// The accessory model number. - var modelNumber: Swift.String { get set } + var modelNumber: String { get set } /// The accessory firmare revision. - var firmwareRevision: Swift.String { get set } + var firmwareRevision: String { get set } /// The accessory hardware revision. - var hardwareRevision: Swift.String { get set } + var hardwareRevision: String { get set } /// The protocol used by the accessory. - var `protocol`: Swift.String { get set } + var `protocol`: String { get set } } diff --git a/swift/src/Ice/IAPEndpointInfo.swift b/swift/src/Ice/IAPEndpointInfo.swift index 3672c343db3..e3f5f1f4a05 100644 --- a/swift/src/Ice/IAPEndpointInfo.swift +++ b/swift/src/Ice/IAPEndpointInfo.swift @@ -1,28 +1,15 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `EndpointInfo.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// Provides access to an IAP endpoint information. public protocol IAPEndpointInfo: EndpointInfo { /// The accessory manufacturer or empty to not match against a manufacturer. - var manufacturer: Swift.String { get set } + var manufacturer: String { get set } /// The accessory model number or empty to not match against a model number. - var modelNumber: Swift.String { get set } + var modelNumber: String { get set } /// The accessory name or empty to not match against the accessory name. - var name: Swift.String { get set } + var name: String { get set } /// The protocol supported by the accessory. - var `protocol`: Swift.String { get set } + var `protocol`: String { get set } } diff --git a/swift/src/Ice/IceSwift.h b/swift/src/Ice/IceSwift.h index af1adbf2471..34c3d84db40 100644 --- a/swift/src/Ice/IceSwift.h +++ b/swift/src/Ice/IceSwift.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import FOUNDATION_EXPORT double IceVersionNumber; diff --git a/swift/src/Ice/ImplicitContext.swift b/swift/src/Ice/ImplicitContext.swift index 4decd90a8ff..2b54ac489cb 100644 --- a/swift/src/Ice/ImplicitContext.swift +++ b/swift/src/Ice/ImplicitContext.swift @@ -1,21 +1,8 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `ImplicitContext.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation -/// An interface to associate implict contexts with communicators. When you make a remote invocation without an +/// An interface to associate implicit contexts with communicators. When you make a remote invocation without an /// explicit context parameter, Ice uses the per-proxy context (if any) combined with the ImplicitContext /// associated with the communicator. /// Ice provides several implementations of ImplicitContext. The implementation used depends on the value @@ -30,7 +17,7 @@ import Foundation /// /// ImplicitContext also provides a number of operations to create, update or retrieve an entry in the /// underlying context without first retrieving a copy of the entire context. -public protocol ImplicitContext: Swift.AnyObject { +public protocol ImplicitContext: AnyObject { /// Get a copy of the underlying context. /// /// - returns: `Context` - A copy of the underlying context. @@ -43,33 +30,33 @@ public protocol ImplicitContext: Swift.AnyObject { /// Check if this key has an associated value in the underlying context. /// - /// - parameter _: `Swift.String` The key. + /// - parameter _: `String` The key. /// - /// - returns: `Swift.Bool` - True if the key has an associated value, False otherwise. - func containsKey(_ key: Swift.String) -> Swift.Bool + /// - returns: `Bool` - True if the key has an associated value, False otherwise. + func containsKey(_ key: String) -> Bool /// Get the value associated with the given key in the underlying context. Returns an empty string if no value is /// associated with the key. containsKey allows you to distinguish between an empty-string value and no /// value at all. /// - /// - parameter _: `Swift.String` The key. + /// - parameter _: `String` The key. /// - /// - returns: `Swift.String` - The value associated with the key. - func get(_ key: Swift.String) -> Swift.String + /// - returns: `String` - The value associated with the key. + func get(_ key: String) -> String /// Create or update a key/value entry in the underlying context. /// - /// - parameter key: `Swift.String` The key. + /// - parameter key: `String` The key. /// - /// - parameter value: `Swift.String` The value. + /// - parameter value: `String` The value. /// - /// - returns: `Swift.String` - The previous value associated with the key, if any. - func put(key: Swift.String, value: Swift.String) -> Swift.String + /// - returns: `String` - The previous value associated with the key, if any. + func put(key: String, value: String) -> String /// Remove the entry for the given key in the underlying context. /// - /// - parameter _: `Swift.String` The key. + /// - parameter _: `String` The key. /// - /// - returns: `Swift.String` - The value associated with the key, if any. - func remove(_ key: Swift.String) -> Swift.String + /// - returns: `String` - The value associated with the key, if any. + func remove(_ key: String) -> String } diff --git a/swift/src/Ice/ImplicitContextI.swift b/swift/src/Ice/ImplicitContextI.swift index d3663831b5c..efc2d76be6c 100644 --- a/swift/src/Ice/ImplicitContextI.swift +++ b/swift/src/Ice/ImplicitContextI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/IncomingRequest.swift b/swift/src/Ice/IncomingRequest.swift index 870db573baa..17d44ec1f2d 100644 --- a/swift/src/Ice/IncomingRequest.swift +++ b/swift/src/Ice/IncomingRequest.swift @@ -1,5 +1,4 @@ // Copyright (c) ZeroC, Inc. - /// Represents a request received by a connection. It's the argument given to `Dispatcher.dispatch`. public final class IncomingRequest { /// Gets the current object for the request. diff --git a/swift/src/Ice/InitializationData.swift b/swift/src/Ice/InitializationData.swift index 76ecabc5da3..407669153e7 100644 --- a/swift/src/Ice/InitializationData.swift +++ b/swift/src/Ice/InitializationData.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. /// Settings optionally supplied during communicator initialization. public struct InitializationData { diff --git a/swift/src/Ice/Initialize.swift b/swift/src/Ice/Initialize.swift index 35b56a14a7c..e113281f875 100644 --- a/swift/src/Ice/Initialize.swift +++ b/swift/src/Ice/Initialize.swift @@ -1,15 +1,13 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl // -// Factories are registered once when `factoriesRegistered' is lazzy initialized, -// all Swift global variables are lazzy initialized. +// Factories are registered once when `factoriesRegistered' is lazy initialized, +// all Swift global variables are lazy initialized. // // All code paths that require the use of the factories before `initialize' is call -// should check `factoriesRegistered' to ensure lazzy initinialization occurrs before +// should check `factoriesRegistered' to ensure lazy initialization occurs before // the factories are used. // let factoriesRegistered: Bool = { @@ -26,7 +24,7 @@ let factoriesRegistered: Bool = { /// - parameter _: `[String]` - A command-line argument vector. Any Ice-related options /// in this vector are used to initialize the communicator. /// -/// - parameter initData: `Ice.InitializationData` - Additional intialization data. Property +/// - parameter initData: `Ice.InitializationData` - Additional initialization data. Property /// settings in args override property settings in initData. /// /// - returns: The initialized communicator. @@ -42,7 +40,7 @@ public func initialize(_ args: [String], initData: InitializationData? = nil) th /// in this vector are used to initialize the communicator. This method modifies the /// argument vector by removing any Ice-related options. /// -/// - parameter initData: `Ice.InitializationData` - Additional intialization data. Property +/// - parameter initData: `Ice.InitializationData` - Additional initialization data. Property /// settings in args override property settings in initData. /// /// - returns: `Ice.Communicator` - The initialized communicator. @@ -119,7 +117,7 @@ private func initializeImpl( ) throws -> (Communicator, [String]) { // Ensure factories are initialized guard factoriesRegistered else { - fatalError("Unable to initialie Ice") + fatalError("Unable to initialize Ice") } var initData = userInitData @@ -153,7 +151,7 @@ private func initializeImpl( } // - // Update initData.logger referecnce in case we are using a C++ logger (defined though a property) or + // Update initData.logger reference in case we are using a C++ logger (defined though a property) or // a C++ logger plug-in installed a new logger // if let objcLogger = handle.getLogger() as? ICELogger { @@ -180,7 +178,7 @@ private func initializeImpl( /// - returns: `Properties` - A new empty property set. public func createProperties() -> Properties { guard factoriesRegistered else { - fatalError("Unable to initialie Ice") + fatalError("Unable to initialize Ice") } return PropertiesI(handle: ICEUtil.createProperties()) } @@ -199,7 +197,7 @@ public func createProperties() -> Properties { /// array and defaults. public func createProperties(_ args: [String], defaults: Properties? = nil) throws -> Properties { guard factoriesRegistered else { - fatalError("Unable to initialie Ice") + fatalError("Unable to initialize Ice") } return try autoreleasepool { let propertiesHandle = try ICEUtil.createProperties( @@ -227,7 +225,7 @@ public func createProperties(_ args: inout [String], defaults: Properties? = nil -> Properties { guard factoriesRegistered else { - fatalError("Unable to initialie Ice") + fatalError("Unable to initialize Ice") } return try autoreleasepool { var remArgs: NSArray? diff --git a/swift/src/Ice/InputStream.swift b/swift/src/Ice/InputStream.swift index 16338e7018c..f6c163f2f18 100644 --- a/swift/src/Ice/InputStream.swift +++ b/swift/src/Ice/InputStream.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import IceImpl diff --git a/swift/src/Ice/Instrumentation.swift b/swift/src/Ice/Instrumentation.swift index ff4234910cb..7219661c0dc 100644 --- a/swift/src/Ice/Instrumentation.swift +++ b/swift/src/Ice/Instrumentation.swift @@ -1,22 +1,9 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Instrumentation.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// The thread state enumeration keeps track of the different possible states of Ice threads. -public enum InstrumentationThreadState: Swift.UInt8 { +public enum InstrumentationThreadState: UInt8 { /// ThreadStateIdle The thread is idle. case ThreadStateIdle = 0 /// ThreadStateInUseForIO The thread is in use performing reads or writes for Ice connections. This state is only @@ -38,7 +25,7 @@ extension InputStream { /// /// - returns: `InstrumentationThreadState` - The enumarated value. public func read() throws -> InstrumentationThreadState { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 3) + let rawValue: UInt8 = try read(enumMaxValue: 3) guard let val = InstrumentationThreadState(rawValue: rawValue) else { throw MarshalException(reason: "invalid enum value") } @@ -50,7 +37,7 @@ extension InputStream { /// - parameter tag: `Int32` - The numeric tag associated with the value. /// /// - returns: `InstrumentationThreadState` - The enumerated value. - public func read(tag: Swift.Int32) throws -> InstrumentationThreadState? { + public func read(tag: Int32) throws -> InstrumentationThreadState? { guard try readOptional(tag: tag, expectedFormat: .Size) else { return nil } @@ -72,7 +59,7 @@ extension OutputStream { /// parameter tag: `Int32` - The numeric tag associated with the value. /// /// parameter _: `InstrumentationThreadState` - The enumerator to write. - public func write(tag: Swift.Int32, value: InstrumentationThreadState?) { + public func write(tag: Int32, value: InstrumentationThreadState?) { guard let v = value else { return } @@ -81,7 +68,7 @@ extension OutputStream { } /// The state of an Ice connection. -public enum InstrumentationConnectionState: Swift.UInt8 { +public enum InstrumentationConnectionState: UInt8 { /// ConnectionStateValidating The connection is being validated. case ConnectionStateValidating = 0 /// ConnectionStateHolding The connection is holding the reception of new messages. @@ -105,7 +92,7 @@ extension InputStream { /// /// - returns: `InstrumentationConnectionState` - The enumarated value. public func read() throws -> InstrumentationConnectionState { - let rawValue: Swift.UInt8 = try read(enumMaxValue: 4) + let rawValue: UInt8 = try read(enumMaxValue: 4) guard let val = InstrumentationConnectionState(rawValue: rawValue) else { throw MarshalException(reason: "invalid enum value") } @@ -117,7 +104,7 @@ extension InputStream { /// - parameter tag: `Int32` - The numeric tag associated with the value. /// /// - returns: `InstrumentationConnectionState` - The enumerated value. - public func read(tag: Swift.Int32) throws -> InstrumentationConnectionState? { + public func read(tag: Int32) throws -> InstrumentationConnectionState? { guard try readOptional(tag: tag, expectedFormat: .Size) else { return nil } @@ -139,7 +126,7 @@ extension OutputStream { /// parameter tag: `Int32` - The numeric tag associated with the value. /// /// parameter _: `InstrumentationConnectionState` - The enumerator to write. - public func write(tag: Swift.Int32, value: InstrumentationConnectionState?) { + public func write(tag: Int32, value: InstrumentationConnectionState?) { guard let v = value else { return } @@ -148,7 +135,7 @@ extension OutputStream { } /// The object observer interface used by instrumented objects to notify the observer of their existence. -public protocol InstrumentationObserver: Swift.AnyObject { +public protocol InstrumentationObserver: AnyObject { /// This method is called when the instrumented object is created or when the observer is attached to an existing /// object. func attach() throws @@ -159,8 +146,8 @@ public protocol InstrumentationObserver: Swift.AnyObject { /// Notification of a failure. /// - /// - parameter _: `Swift.String` The name of the exception. - func failed(_ exceptionName: Swift.String) throws + /// - parameter _: `String` The name of the exception. + func failed(_ exceptionName: String) throws } /// The thread observer interface to instrument Ice threads. This can be threads from the Ice thread pool or utility @@ -179,13 +166,13 @@ public protocol InstrumentationThreadObserver: InstrumentationObserver { public protocol InstrumentationConnectionObserver: InstrumentationObserver { /// Notification of sent bytes over the connection. /// - /// - parameter _: `Swift.Int32` The number of bytes sent. - func sentBytes(_ num: Swift.Int32) throws + /// - parameter _: `Int32` The number of bytes sent. + func sentBytes(_ num: Int32) throws /// Notification of received bytes over the connection. /// - /// - parameter _: `Swift.Int32` The number of bytes received. - func receivedBytes(_ num: Swift.Int32) throws + /// - parameter _: `Int32` The number of bytes received. + func receivedBytes(_ num: Int32) throws } /// The dispatch observer to instrument servant dispatch. @@ -195,16 +182,16 @@ public protocol InstrumentationDispatchObserver: InstrumentationObserver { /// Reply notification. /// - /// - parameter _: `Swift.Int32` The size of the reply. - func reply(_ size: Swift.Int32) throws + /// - parameter _: `Int32` The size of the reply. + func reply(_ size: Int32) throws } /// The child invocation observer to instrument remote or collocated invocations. public protocol InstrumentationChildInvocationObserver: InstrumentationObserver { /// Reply notification. /// - /// - parameter _: `Swift.Int32` The size of the reply. - func reply(_ size: Swift.Int32) throws + /// - parameter _: `Int32` The size of the reply. + func reply(_ size: Int32) throws } /// The remote observer to instrument invocations that are sent over the wire. @@ -228,13 +215,13 @@ public protocol InstrumentationInvocationObserver: InstrumentationObserver { /// /// - parameter endpt: `Endpoint?` The connection endpoint. /// - /// - parameter requestId: `Swift.Int32` The ID of the invocation. + /// - parameter requestId: `Int32` The ID of the invocation. /// - /// - parameter size: `Swift.Int32` The size of the invocation. + /// - parameter size: `Int32` The size of the invocation. /// /// - returns: `InstrumentationRemoteObserver?` - The observer to instrument the remote invocation. func getRemoteObserver( - con: ConnectionInfo?, endpt: Endpoint?, requestId: Swift.Int32, size: Swift.Int32 + con: ConnectionInfo?, endpt: Endpoint?, requestId: Int32, size: Int32 ) throws -> InstrumentationRemoteObserver? @@ -242,12 +229,12 @@ public protocol InstrumentationInvocationObserver: InstrumentationObserver { /// /// - parameter adapter: `ObjectAdapter?` The object adapter hosting the collocated Ice object. /// - /// - parameter requestId: `Swift.Int32` The ID of the invocation. + /// - parameter requestId: `Int32` The ID of the invocation. /// - /// - parameter size: `Swift.Int32` The size of the invocation. + /// - parameter size: `Int32` The size of the invocation. /// /// - returns: `InstrumentationCollocatedObserver?` - The observer to instrument the collocated invocation. - func getCollocatedObserver(adapter: ObjectAdapter?, requestId: Swift.Int32, size: Swift.Int32) + func getCollocatedObserver(adapter: ObjectAdapter?, requestId: Int32, size: Int32) throws -> InstrumentationCollocatedObserver? } @@ -257,7 +244,7 @@ public protocol InstrumentationInvocationObserver: InstrumentationObserver { /// provide the observer updater. /// This interface can be used by add-ins implementing the CommunicatorObserver interface to update the /// observers of connections and threads. -public protocol InstrumentationObserverUpdater: Swift.AnyObject { +public protocol InstrumentationObserverUpdater: AnyObject { /// Update connection observers associated with each of the Ice connection from the communicator and its object /// adapters. /// When called, this method goes through all the connections and for each connection @@ -276,17 +263,17 @@ public protocol InstrumentationObserverUpdater: Swift.AnyObject { /// objects. This interface should be implemented by add-ins that wish to observe Ice objects in order to collect /// statistics. An instance of this interface can be provided to the Ice run-time through the Ice communicator /// initialization data. -public protocol InstrumentationCommunicatorObserver: Swift.AnyObject { +public protocol InstrumentationCommunicatorObserver: AnyObject { /// This method should return an observer for the given endpoint information and connector. The Ice run-time calls /// this method for each connection establishment attempt. /// /// - parameter endpt: `Endpoint?` The endpoint. /// - /// - parameter connector: `Swift.String` The description of the connector. For IP transports, this is typically + /// - parameter connector: `String` The description of the connector. For IP transports, this is typically /// the IP address to connect to. /// /// - returns: `InstrumentationObserver?` - The observer to instrument the connection establishment. - func getConnectionEstablishmentObserver(endpt: Endpoint?, connector: Swift.String) + func getConnectionEstablishmentObserver(endpt: Endpoint?, connector: String) throws -> InstrumentationObserver? /// This method should return an observer for the given endpoint information. The Ice run-time calls this method to @@ -323,9 +310,9 @@ public protocol InstrumentationCommunicatorObserver: Swift.AnyObject { /// new thread and for all the Ice communicator threads when ObserverUpdater.updateThreadObservers is /// called. /// - /// - parameter parent: `Swift.String` The parent of the thread. + /// - parameter parent: `String` The parent of the thread. /// - /// - parameter id: `Swift.String` The ID of the thread to observe. + /// - parameter id: `String` The ID of the thread to observe. /// /// - parameter s: `InstrumentationThreadState` The state of the thread. /// @@ -334,8 +321,8 @@ public protocol InstrumentationCommunicatorObserver: Swift.AnyObject { /// /// - returns: `InstrumentationThreadObserver?` - The thread observer to instrument the thread. func getThreadObserver( - parent: Swift.String, - id: Swift.String, + parent: String, + id: String, s: InstrumentationThreadState, o: InstrumentationThreadObserver? ) throws -> InstrumentationThreadObserver? @@ -345,14 +332,14 @@ public protocol InstrumentationCommunicatorObserver: Swift.AnyObject { /// /// - parameter prx: `ObjectPrx?` The proxy used for the invocation. /// - /// - parameter operation: `Swift.String` The name of the operation. + /// - parameter operation: `String` The name of the operation. /// /// - parameter ctx: `Context` The context specified by the user. /// /// - returns: `InstrumentationInvocationObserver?` - The invocation observer to instrument the invocation. func getInvocationObserver( prx: ObjectPrx?, - operation: Swift.String, + operation: String, ctx: Context ) throws -> InstrumentationInvocationObserver? @@ -361,10 +348,10 @@ public protocol InstrumentationCommunicatorObserver: Swift.AnyObject { /// /// - parameter c: `Current` The current object as provided to the Ice servant dispatching the invocation. /// - /// - parameter size: `Swift.Int32` The size of the dispatch. + /// - parameter size: `Int32` The size of the dispatch. /// /// - returns: `InstrumentationDispatchObserver?` - The dispatch observer to instrument the dispatch. - func getDispatchObserver(c: Current, size: Swift.Int32) throws -> InstrumentationDispatchObserver? + func getDispatchObserver(c: Current, size: Int32) throws -> InstrumentationDispatchObserver? /// The Ice run-time calls this method when the communicator is initialized. The add-in implementing this /// interface can use this object to get the Ice run-time to re-obtain observers for observed objects. diff --git a/swift/src/Ice/LocalException.swift b/swift/src/Ice/LocalException.swift index 35d5df57932..30db0473ac5 100644 --- a/swift/src/Ice/LocalException.swift +++ b/swift/src/Ice/LocalException.swift @@ -1,45 +1,32 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `LocalException.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// This exception is raised when a failure occurs during initialization. open class InitializationException: LocalException { /// The reason for the failure. - public var reason: Swift.String = "" + public var reason: String = "" public required init() { super.init() } - public init(reason: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(reason: String, file: String = #file, line: Int32 = #line) { self.reason = reason super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::InitializationException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _InitializationExceptionDescription } } @@ -47,28 +34,28 @@ open class InitializationException: LocalException { /// This exception indicates that a failure occurred while initializing a plug-in. open class PluginInitializationException: LocalException { /// The reason for the failure. - public var reason: Swift.String = "" + public var reason: String = "" public required init() { super.init() } - public init(reason: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(reason: String, file: String = #file, line: Int32 = #line) { self.reason = reason super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::PluginInitializationException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _PluginInitializationExceptionDescription } } @@ -79,16 +66,16 @@ open class PluginInitializationException: LocalException { open class AlreadyRegisteredException: LocalException { /// The kind of object that could not be removed: "servant", "facet", "object", "default servant", /// "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - public var kindOfObject: Swift.String = "" + public var kindOfObject: String = "" /// The ID (or name) of the object that is registered already. - public var id: Swift.String = "" + public var id: String = "" public required init() { super.init() } public init( - kindOfObject: Swift.String, id: Swift.String, file: Swift.String = #file, + kindOfObject: String, id: String, file: String = #file, line: Int32 = #line ) { self.kindOfObject = kindOfObject @@ -98,15 +85,15 @@ open class AlreadyRegisteredException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::AlreadyRegisteredException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _AlreadyRegisteredExceptionDescription } } @@ -119,16 +106,16 @@ open class AlreadyRegisteredException: LocalException { open class NotRegisteredException: LocalException { /// The kind of object that could not be removed: "servant", "facet", "object", "default servant", /// "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - public var kindOfObject: Swift.String = "" + public var kindOfObject: String = "" /// The ID (or name) of the object that could not be removed. - public var id: Swift.String = "" + public var id: String = "" public required init() { super.init() } public init( - kindOfObject: Swift.String, id: Swift.String, file: Swift.String = #file, + kindOfObject: String, id: String, file: String = #file, line: Int32 = #line ) { self.kindOfObject = kindOfObject @@ -138,15 +125,15 @@ open class NotRegisteredException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::NotRegisteredException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _NotRegisteredExceptionDescription } } @@ -156,28 +143,28 @@ open class NotRegisteredException: LocalException { /// ice_batchDatagram and the operation has a return value, out-parameters, or an exception specification. open class TwowayOnlyException: LocalException { /// The name of the operation that was invoked. - public var operation: Swift.String = "" + public var operation: String = "" public required init() { super.init() } - public init(operation: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(operation: String, file: String = #file, line: Int32 = #line) { self.operation = operation super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::TwowayOnlyException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _TwowayOnlyExceptionDescription } } @@ -189,15 +176,15 @@ open class TwowayOnlyException: LocalException { open class CloneNotImplementedException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CloneNotImplementedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CloneNotImplementedExceptionDescription } } @@ -207,28 +194,28 @@ open class CloneNotImplementedException: LocalException { /// Ice::LocalException or Ice::UserException. open class UnknownException: LocalException { /// This field is set to the textual representation of the unknown exception if available. - public var unknown: Swift.String = "" + public var unknown: String = "" public required init() { super.init() } - public init(unknown: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(unknown: String, file: String = #file, line: Int32 = #line) { self.unknown = unknown super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownExceptionDescription } } @@ -241,15 +228,15 @@ open class UnknownException: LocalException { open class UnknownLocalException: UnknownException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownLocalException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownLocalExceptionDescription } } @@ -262,15 +249,15 @@ open class UnknownLocalException: UnknownException { open class UnknownUserException: UnknownException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownUserException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownUserExceptionDescription } } @@ -279,15 +266,15 @@ open class UnknownUserException: UnknownException { open class VersionMismatchException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::VersionMismatchException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _VersionMismatchExceptionDescription } } @@ -296,15 +283,15 @@ open class VersionMismatchException: LocalException { open class CommunicatorDestroyedException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CommunicatorDestroyedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CommunicatorDestroyedExceptionDescription } } @@ -312,28 +299,28 @@ open class CommunicatorDestroyedException: LocalException { /// This exception is raised if an attempt is made to use a deactivated ObjectAdapter. open class ObjectAdapterDeactivatedException: LocalException { /// Name of the adapter. - public var name: Swift.String = "" + public var name: String = "" public required init() { super.init() } - public init(name: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(name: String, file: String = #file, line: Int32 = #line) { self.name = name super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ObjectAdapterDeactivatedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ObjectAdapterDeactivatedExceptionDescription } } @@ -342,28 +329,28 @@ open class ObjectAdapterDeactivatedException: LocalException { /// detects another active ObjectAdapter with the same adapter id. open class ObjectAdapterIdInUseException: LocalException { /// Adapter ID. - public var id: Swift.String = "" + public var id: String = "" public required init() { super.init() } - public init(id: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(id: String, file: String = #file, line: Int32 = #line) { self.id = id super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ObjectAdapterIdInUseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ObjectAdapterIdInUseExceptionDescription } } @@ -371,28 +358,28 @@ open class ObjectAdapterIdInUseException: LocalException { /// This exception is raised if no suitable endpoint is available. open class NoEndpointException: LocalException { /// The stringified proxy for which no suitable endpoint is available. - public var proxy: Swift.String = "" + public var proxy: String = "" public required init() { super.init() } - public init(proxy: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(proxy: String, file: String = #file, line: Int32 = #line) { self.proxy = proxy super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::NoEndpointException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _NoEndpointExceptionDescription } } @@ -400,28 +387,28 @@ open class NoEndpointException: LocalException { /// This exception is raised if there was an error while parsing an endpoint. open class EndpointParseException: LocalException { /// Describes the failure and includes the string that could not be parsed. - public var str: Swift.String = "" + public var str: String = "" public required init() { super.init() } - public init(str: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(str: String, file: String = #file, line: Int32 = #line) { self.str = str super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::EndpointParseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _EndpointParseExceptionDescription } } @@ -429,28 +416,28 @@ open class EndpointParseException: LocalException { /// This exception is raised if there was an error while parsing an endpoint selection type. open class EndpointSelectionTypeParseException: LocalException { /// Describes the failure and includes the string that could not be parsed. - public var str: Swift.String = "" + public var str: String = "" public required init() { super.init() } - public init(str: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(str: String, file: String = #file, line: Int32 = #line) { self.str = str super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::EndpointSelectionTypeParseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _EndpointSelectionTypeParseExceptionDescription } } @@ -458,28 +445,28 @@ open class EndpointSelectionTypeParseException: LocalException { /// This exception is raised if there was an error while parsing a version. open class VersionParseException: LocalException { /// Describes the failure and includes the string that could not be parsed. - public var str: Swift.String = "" + public var str: String = "" public required init() { super.init() } - public init(str: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(str: String, file: String = #file, line: Int32 = #line) { self.str = str super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::VersionParseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _VersionParseExceptionDescription } } @@ -487,28 +474,28 @@ open class VersionParseException: LocalException { /// This exception is raised if there was an error while parsing a stringified identity. open class IdentityParseException: LocalException { /// Describes the failure and includes the string that could not be parsed. - public var str: Swift.String = "" + public var str: String = "" public required init() { super.init() } - public init(str: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(str: String, file: String = #file, line: Int32 = #line) { self.str = str super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::IdentityParseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _IdentityParseExceptionDescription } } @@ -516,28 +503,28 @@ open class IdentityParseException: LocalException { /// This exception is raised if there was an error while parsing a stringified proxy. open class ProxyParseException: LocalException { /// Describes the failure and includes the string that could not be parsed. - public var str: Swift.String = "" + public var str: String = "" public required init() { super.init() } - public init(str: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(str: String, file: String = #file, line: Int32 = #line) { self.str = str super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ProxyParseException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ProxyParseExceptionDescription } } @@ -546,15 +533,15 @@ open class ProxyParseException: LocalException { open class IllegalIdentityException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::IllegalIdentityException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _IllegalIdentityExceptionDescription } } @@ -562,28 +549,28 @@ open class IllegalIdentityException: LocalException { /// This exception is raised to reject an illegal servant (typically a null servant). open class IllegalServantException: LocalException { /// Describes why this servant is illegal. - public var reason: Swift.String = "" + public var reason: String = "" public required init() { super.init() } - public init(reason: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(reason: String, file: String = #file, line: Int32 = #line) { self.reason = reason super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::IllegalServantException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _IllegalServantExceptionDescription } } @@ -595,9 +582,9 @@ open class RequestFailedException: LocalException { /// The identity of the Ice Object to which the request was sent. public var id: Identity = .init() /// The facet to which the request was sent. - public var facet: Swift.String = "" + public var facet: String = "" /// The operation name of the request. - public var operation: Swift.String = "" + public var operation: String = "" public required init() { super.init() @@ -605,9 +592,9 @@ open class RequestFailedException: LocalException { public init( id: Identity, - facet: Swift.String, - operation: Swift.String, - file: Swift.String = #file, + facet: String, + operation: String, + file: String = #file, line: Int32 = #line ) { self.id = id @@ -618,15 +605,15 @@ open class RequestFailedException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::RequestFailedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _RequestFailedExceptionDescription } } @@ -636,15 +623,15 @@ open class RequestFailedException: LocalException { open class ObjectNotExistException: RequestFailedException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ObjectNotExistException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ObjectNotExistExceptionDescription } } @@ -654,15 +641,15 @@ open class ObjectNotExistException: RequestFailedException { open class FacetNotExistException: RequestFailedException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::FacetNotExistException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _FacetNotExistExceptionDescription } } @@ -672,15 +659,15 @@ open class FacetNotExistException: RequestFailedException { open class OperationNotExistException: RequestFailedException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::OperationNotExistException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _OperationNotExistExceptionDescription } } @@ -691,28 +678,28 @@ open class SyscallException: LocalException { /// The error number describing the system exception. For C++ and Unix, this is equivalent to errno. /// For C++ and Windows, this is the value returned by GetLastError() or /// WSAGetLastError(). - public var error: Swift.Int32 = 0 + public var error: Int32 = 0 public required init() { super.init() } - public init(error: Swift.Int32, file: Swift.String = #file, line: Int32 = #line) { + public init(error: Int32, file: String = #file, line: Int32 = #line) { self.error = error super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::SyscallException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _SyscallExceptionDescription } } @@ -721,15 +708,15 @@ open class SyscallException: LocalException { open class SocketException: SyscallException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::SocketException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _SocketExceptionDescription } } @@ -737,14 +724,14 @@ open class SocketException: SyscallException { /// This exception indicates CFNetwork errors. open class CFNetworkException: SocketException { /// The domain of the error. - public var domain: Swift.String = "" + public var domain: String = "" public required init() { super.init() } public init( - error: Swift.Int32, domain: Swift.String, file: Swift.String = #file, line: Int32 = #line + error: Int32, domain: String, file: String = #file, line: Int32 = #line ) { self.domain = domain super.init(error: error, file: file, line: line) @@ -752,15 +739,15 @@ open class CFNetworkException: SocketException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CFNetworkException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CFNetworkExceptionDescription } } @@ -768,14 +755,14 @@ open class CFNetworkException: SocketException { /// This exception indicates file errors. open class FileException: SyscallException { /// The path of the file responsible for the error. - public var path: Swift.String = "" + public var path: String = "" public required init() { super.init() } public init( - error: Swift.Int32, path: Swift.String, file: Swift.String = #file, line: Int32 = #line + error: Int32, path: String, file: String = #file, line: Int32 = #line ) { self.path = path super.init(error: error, file: file, line: line) @@ -783,15 +770,15 @@ open class FileException: SyscallException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::FileException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _FileExceptionDescription } } @@ -800,15 +787,15 @@ open class FileException: SyscallException { open class ConnectFailedException: SocketException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectFailedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectFailedExceptionDescription } } @@ -817,15 +804,15 @@ open class ConnectFailedException: SocketException { open class ConnectionRefusedException: ConnectFailedException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectionRefusedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectionRefusedExceptionDescription } } @@ -834,15 +821,15 @@ open class ConnectionRefusedException: ConnectFailedException { open class ConnectionLostException: SocketException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectionLostException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectionLostExceptionDescription } } @@ -851,16 +838,16 @@ open class ConnectionLostException: SocketException { open class DNSException: LocalException { /// The error number describing the DNS problem. For C++ and Unix, this is equivalent to h_errno. For /// C++ and Windows, this is the value returned by WSAGetLastError(). - public var error: Swift.Int32 = 0 + public var error: Int32 = 0 /// The host name that could not be resolved. - public var host: Swift.String = "" + public var host: String = "" public required init() { super.init() } public init( - error: Swift.Int32, host: Swift.String, file: Swift.String = #file, line: Int32 = #line + error: Int32, host: String, file: String = #file, line: Int32 = #line ) { self.error = error self.host = host @@ -869,15 +856,15 @@ open class DNSException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::DNSException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _DNSExceptionDescription } } @@ -886,15 +873,15 @@ open class DNSException: LocalException { open class OperationInterruptedException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::OperationInterruptedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _OperationInterruptedExceptionDescription } } @@ -903,15 +890,15 @@ open class OperationInterruptedException: LocalException { open class ConnectionIdleException: TimeoutException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectionIdleException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectionIdleExceptionDescription } } @@ -920,15 +907,15 @@ open class ConnectionIdleException: TimeoutException { open class TimeoutException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::TimeoutException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _TimeoutExceptionDescription } } @@ -937,15 +924,15 @@ open class TimeoutException: LocalException { open class ConnectTimeoutException: TimeoutException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectTimeoutException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectTimeoutExceptionDescription } } @@ -954,15 +941,15 @@ open class ConnectTimeoutException: TimeoutException { open class CloseTimeoutException: TimeoutException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CloseTimeoutException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CloseTimeoutExceptionDescription } } @@ -971,15 +958,15 @@ open class CloseTimeoutException: TimeoutException { open class InvocationTimeoutException: TimeoutException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::InvocationTimeoutException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _InvocationTimeoutExceptionDescription } } @@ -988,15 +975,15 @@ open class InvocationTimeoutException: TimeoutException { open class InvocationCanceledException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::InvocationCanceledException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _InvocationCanceledExceptionDescription } } @@ -1004,28 +991,28 @@ open class InvocationCanceledException: LocalException { /// A generic exception base for all kinds of protocol error conditions. open class ProtocolException: LocalException { /// The reason for the failure. - public var reason: Swift.String = "" + public var reason: String = "" public required init() { super.init() } - public init(reason: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(reason: String, file: String = #file, line: Int32 = #line) { self.reason = reason super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ProtocolException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ProtocolExceptionDescription } } @@ -1040,7 +1027,7 @@ open class BadMagicException: ProtocolException { } public init( - reason: Swift.String, badMagic: ByteSeq, file: Swift.String = #file, line: Int32 = #line + reason: String, badMagic: ByteSeq, file: String = #file, line: Int32 = #line ) { self.badMagic = badMagic super.init(reason: reason, file: file, line: line) @@ -1048,15 +1035,15 @@ open class BadMagicException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::BadMagicException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _BadMagicExceptionDescription } } @@ -1073,10 +1060,10 @@ open class UnsupportedProtocolException: ProtocolException { } public init( - reason: Swift.String, + reason: String, bad: ProtocolVersion, supported: ProtocolVersion, - file: Swift.String = #file, + file: String = #file, line: Int32 = #line ) { self.bad = bad @@ -1086,15 +1073,15 @@ open class UnsupportedProtocolException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnsupportedProtocolException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnsupportedProtocolExceptionDescription } } @@ -1111,10 +1098,10 @@ open class UnsupportedEncodingException: ProtocolException { } public init( - reason: Swift.String, + reason: String, bad: EncodingVersion, supported: EncodingVersion, - file: Swift.String = #file, + file: String = #file, line: Int32 = #line ) { self.bad = bad @@ -1124,15 +1111,15 @@ open class UnsupportedEncodingException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnsupportedEncodingException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnsupportedEncodingExceptionDescription } } @@ -1141,15 +1128,15 @@ open class UnsupportedEncodingException: ProtocolException { open class UnknownMessageException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownMessageException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownMessageExceptionDescription } } @@ -1158,15 +1145,15 @@ open class UnknownMessageException: ProtocolException { open class ConnectionNotValidatedException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectionNotValidatedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectionNotValidatedExceptionDescription } } @@ -1175,15 +1162,15 @@ open class ConnectionNotValidatedException: ProtocolException { open class UnknownRequestIdException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownRequestIdException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownRequestIdExceptionDescription } } @@ -1192,15 +1179,15 @@ open class UnknownRequestIdException: ProtocolException { open class UnknownReplyStatusException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnknownReplyStatusException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnknownReplyStatusExceptionDescription } } @@ -1213,15 +1200,15 @@ open class UnknownReplyStatusException: ProtocolException { open class CloseConnectionException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CloseConnectionException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CloseConnectionExceptionDescription } } @@ -1230,28 +1217,28 @@ open class CloseConnectionException: ProtocolException { /// Connection.close. open class ConnectionManuallyClosedException: LocalException { /// True if the connection was closed gracefully, false otherwise. - public var graceful: Swift.Bool = false + public var graceful: Bool = false public required init() { super.init() } - public init(graceful: Swift.Bool, file: Swift.String = #file, line: Int32 = #line) { + public init(graceful: Bool, file: String = #file, line: Int32 = #line) { self.graceful = graceful super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ConnectionManuallyClosedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ConnectionManuallyClosedExceptionDescription } } @@ -1260,15 +1247,15 @@ open class ConnectionManuallyClosedException: LocalException { open class IllegalMessageSizeException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::IllegalMessageSizeException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _IllegalMessageSizeExceptionDescription } } @@ -1277,15 +1264,15 @@ open class IllegalMessageSizeException: ProtocolException { open class CompressionException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::CompressionException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _CompressionExceptionDescription } } @@ -1295,15 +1282,15 @@ open class CompressionException: ProtocolException { open class DatagramLimitException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::DatagramLimitException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _DatagramLimitExceptionDescription } } @@ -1312,15 +1299,15 @@ open class DatagramLimitException: ProtocolException { open class MarshalException: ProtocolException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::MarshalException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _MarshalExceptionDescription } } @@ -1329,15 +1316,15 @@ open class MarshalException: ProtocolException { open class ProxyUnmarshalException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::ProxyUnmarshalException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _ProxyUnmarshalExceptionDescription } } @@ -1346,15 +1333,15 @@ open class ProxyUnmarshalException: MarshalException { open class UnmarshalOutOfBoundsException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnmarshalOutOfBoundsException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnmarshalOutOfBoundsExceptionDescription } } @@ -1362,14 +1349,14 @@ open class UnmarshalOutOfBoundsException: MarshalException { /// This exception is raised if no suitable value factory was found during unmarshaling of a Slice class instance. open class NoValueFactoryException: MarshalException { /// The Slice type ID of the class instance for which no factory could be found. - public var type: Swift.String = "" + public var type: String = "" public required init() { super.init() } public init( - reason: Swift.String, type: Swift.String, file: Swift.String = #file, line: Int32 = #line + reason: String, type: String, file: String = #file, line: Int32 = #line ) { self.type = type super.init(reason: reason, file: file, line: line) @@ -1377,15 +1364,15 @@ open class NoValueFactoryException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::NoValueFactoryException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _NoValueFactoryExceptionDescription } } @@ -1396,19 +1383,19 @@ open class NoValueFactoryException: MarshalException { /// used to send Slice class instances and an operation is subscribed to the wrong topic. open class UnexpectedObjectException: MarshalException { /// The Slice type ID of the class instance that was unmarshaled. - public var type: Swift.String = "" + public var type: String = "" /// The Slice type ID that was expected by the receiving operation. - public var expectedType: Swift.String = "" + public var expectedType: String = "" public required init() { super.init() } public init( - reason: Swift.String, - type: Swift.String, - expectedType: Swift.String, - file: Swift.String = #file, + reason: String, + type: String, + expectedType: String, + file: String = #file, line: Int32 = #line ) { self.type = type @@ -1418,15 +1405,15 @@ open class UnexpectedObjectException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::UnexpectedObjectException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _UnexpectedObjectExceptionDescription } } @@ -1436,15 +1423,15 @@ open class UnexpectedObjectException: MarshalException { open class MemoryLimitException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::MemoryLimitException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _MemoryLimitExceptionDescription } } @@ -1453,15 +1440,15 @@ open class MemoryLimitException: MarshalException { open class StringConversionException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::StringConversionException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _StringConversionExceptionDescription } } @@ -1470,15 +1457,15 @@ open class StringConversionException: MarshalException { open class EncapsulationException: MarshalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::EncapsulationException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _EncapsulationExceptionDescription } } @@ -1487,28 +1474,28 @@ open class EncapsulationException: MarshalException { /// unsupported feature. open class FeatureNotSupportedException: LocalException { /// The name of the unsupported feature. - public var unsupportedFeature: Swift.String = "" + public var unsupportedFeature: String = "" public required init() { super.init() } - public init(unsupportedFeature: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(unsupportedFeature: String, file: String = #file, line: Int32 = #line) { self.unsupportedFeature = unsupportedFeature super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::FeatureNotSupportedException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _FeatureNotSupportedExceptionDescription } } @@ -1516,28 +1503,28 @@ open class FeatureNotSupportedException: LocalException { /// This exception indicates a failure in a security subsystem, such as the IceSSL plug-in. open class SecurityException: LocalException { /// The reason for the failure. - public var reason: Swift.String = "" + public var reason: String = "" public required init() { super.init() } - public init(reason: Swift.String, file: Swift.String = #file, line: Int32 = #line) { + public init(reason: String, file: String = #file, line: Int32 = #line) { self.reason = reason super.init(file: file, line: line) } /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::SecurityException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _SecurityExceptionDescription } } @@ -1546,15 +1533,15 @@ open class SecurityException: LocalException { open class FixedProxyException: LocalException { /// Returns the Slice type ID of this exception. /// - /// - returns: `Swift.String` - the Slice type ID of this exception. - override open class func ice_staticId() -> Swift.String { + /// - returns: `String` - the Slice type ID of this exception. + override open class func ice_staticId() -> String { return "::Ice::FixedProxyException" } /// Returns a string representation of this exception /// - /// - returns: `Swift.String` - The string representaton of this exception. - override open func ice_print() -> Swift.String { + /// - returns: `String` - The string representaton of this exception. + override open func ice_print() -> String { return _FixedProxyExceptionDescription } } diff --git a/swift/src/Ice/LocalExceptionDescription.swift b/swift/src/Ice/LocalExceptionDescription.swift index a39809c0131..6042ef1277e 100644 --- a/swift/src/Ice/LocalExceptionDescription.swift +++ b/swift/src/Ice/LocalExceptionDescription.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/LocalExceptionFactory.swift b/swift/src/Ice/LocalExceptionFactory.swift index 0c4085d0c55..3f789a44a2b 100644 --- a/swift/src/Ice/LocalExceptionFactory.swift +++ b/swift/src/Ice/LocalExceptionFactory.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/LocalObject.swift b/swift/src/Ice/LocalObject.swift index 0fca342ae02..66e3a634e8e 100644 --- a/swift/src/Ice/LocalObject.swift +++ b/swift/src/Ice/LocalObject.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/Logger.swift b/swift/src/Ice/Logger.swift index 75a1c70db82..c08a2f208ce 100644 --- a/swift/src/Ice/Logger.swift +++ b/swift/src/Ice/Logger.swift @@ -1,55 +1,42 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Logger.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// The Ice message logger. Applications can provide their own logger by implementing this interface and installing it /// in a communicator. -public protocol Logger: Swift.AnyObject { +public protocol Logger: AnyObject { /// Print a message. The message is printed literally, without any decorations such as executable name or time /// stamp. /// - /// - parameter _: `Swift.String` The message to log. - func print(_ message: Swift.String) + /// - parameter _: `String` The message to log. + func print(_ message: String) /// Log a trace message. /// - /// - parameter category: `Swift.String` The trace category. + /// - parameter category: `String` The trace category. /// - /// - parameter message: `Swift.String` The trace message to log. - func trace(category: Swift.String, message: Swift.String) + /// - parameter message: `String` The trace message to log. + func trace(category: String, message: String) /// Log a warning message. /// - /// - parameter _: `Swift.String` The warning message to log. - func warning(_ message: Swift.String) + /// - parameter _: `String` The warning message to log. + func warning(_ message: String) /// Log an error message. /// - /// - parameter _: `Swift.String` The error message to log. - func error(_ message: Swift.String) + /// - parameter _: `String` The error message to log. + func error(_ message: String) /// Returns this logger's prefix. /// - /// - returns: `Swift.String` - The prefix. - func getPrefix() -> Swift.String + /// - returns: `String` - The prefix. + func getPrefix() -> String /// Returns a clone of the logger with a new prefix. /// - /// - parameter _: `Swift.String` The new prefix for the logger. + /// - parameter _: `String` The new prefix for the logger. /// /// - returns: `Logger` - A logger instance. - func cloneWithPrefix(_ prefix: Swift.String) -> Logger + func cloneWithPrefix(_ prefix: String) -> Logger } diff --git a/swift/src/Ice/LoggerWrapper.swift b/swift/src/Ice/LoggerWrapper.swift index f15ab0b5f75..52a18d9ef41 100644 --- a/swift/src/Ice/LoggerWrapper.swift +++ b/swift/src/Ice/LoggerWrapper.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/Mutex.swift b/swift/src/Ice/Mutex.swift index 633f5902915..fc556b31675 100644 --- a/swift/src/Ice/Mutex.swift +++ b/swift/src/Ice/Mutex.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/NativePropertiesAdmin.swift b/swift/src/Ice/NativePropertiesAdmin.swift index 51de0019312..df46d44992c 100644 --- a/swift/src/Ice/NativePropertiesAdmin.swift +++ b/swift/src/Ice/NativePropertiesAdmin.swift @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. /// Closure called when the communicator's properties have been updated. /// /// - parameter: `PropertyDict` A dictionary containing the properties that were added, diff --git a/swift/src/Ice/Object.swift b/swift/src/Ice/Object.swift index 8bfb1f56bf6..b124adf8fc9 100644 --- a/swift/src/Ice/Object.swift +++ b/swift/src/Ice/Object.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl import PromiseKit diff --git a/swift/src/Ice/ObjectAdapter.swift b/swift/src/Ice/ObjectAdapter.swift index 5a3330cd670..2b6033559fb 100644 --- a/swift/src/Ice/ObjectAdapter.swift +++ b/swift/src/Ice/ObjectAdapter.swift @@ -1,28 +1,15 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `ObjectAdapter.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// The object adapter provides an up-call interface from the Ice run time to the implementation of Ice objects. The /// object adapter is responsible for receiving requests from endpoints, and for mapping between servants, identities, /// and proxies. -public protocol ObjectAdapter: Swift.AnyObject { +public protocol ObjectAdapter: AnyObject { /// Get the name of this object adapter. /// - /// - returns: `Swift.String` - This object adapter's name. - func getName() -> Swift.String + /// - returns: `String` - This object adapter's name. + func getName() -> String /// Get the communicator this object adapter belongs to. /// @@ -60,8 +47,8 @@ public protocol ObjectAdapter: Swift.AnyObject { /// Check whether object adapter has been deactivated. /// - /// - returns: `Swift.Bool` - Whether adapter has been deactivated. - func isDeactivated() -> Swift.Bool + /// - returns: `Bool` - Whether adapter has been deactivated. + func isDeactivated() -> Bool /// Destroys the object adapter and cleans up all resources held by the object adapter. If the object adapter has /// not yet been deactivated, destroy implicitly initiates the deactivation and waits for it to finish. Subsequent @@ -88,11 +75,11 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter id: `Identity` The identity of the Ice object that is implemented by the servant. /// - /// - parameter facet: `Swift.String` The facet. An empty facet means the default facet. + /// - parameter facet: `String` The facet. An empty facet means the default facet. /// /// - returns: `ObjectPrx` - A proxy that matches the given identity, facet, and this object adapter. @discardableResult - func addFacet(servant: Dispatcher, id: Identity, facet: Swift.String) throws -> ObjectPrx + func addFacet(servant: Dispatcher, id: Identity, facet: String) throws -> ObjectPrx /// Add a servant to this object adapter's Active Servant Map, using an automatically generated UUID as its /// identity. Note that the generated UUID identity can be accessed using the proxy's ice_getIdentity @@ -109,11 +96,11 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter servant: `Dispatcher` The servant to add. /// - /// - parameter facet: `Swift.String` The facet. An empty facet means the default facet. + /// - parameter facet: `String` The facet. An empty facet means the default facet. /// /// - returns: `ObjectPrx` - A proxy that matches the generated UUID identity, facet, and this object adapter. @discardableResult - func addFacetWithUUID(servant: Dispatcher, facet: Swift.String) throws -> ObjectPrx + func addFacetWithUUID(servant: Dispatcher, facet: String) throws -> ObjectPrx /// Add a default servant to handle requests for a specific category. Adding a default servant for a category for /// which a default servant is already registered throws AlreadyRegisteredException. To dispatch operation @@ -130,9 +117,9 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter servant: `Dispatcher` The default servant. /// - /// - parameter category: `Swift.String` The category for which the default servant is registered. An empty + /// - parameter category: `String` The category for which the default servant is registered. An empty /// category means it will handle all categories. - func addDefaultServant(servant: Dispatcher, category: Swift.String) throws + func addDefaultServant(servant: Dispatcher, category: String) throws /// Remove a servant (that is, the default facet) from the object adapter's Active Servant Map. /// @@ -149,11 +136,11 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter id: `Identity` The identity of the Ice object that is implemented by the servant. /// - /// - parameter facet: `Swift.String` The facet. An empty facet means the default facet. + /// - parameter facet: `String` The facet. An empty facet means the default facet. /// /// - returns: `Dispatcher` - The removed servant. @discardableResult - func removeFacet(id: Identity, facet: Swift.String) throws -> Dispatcher + func removeFacet(id: Identity, facet: String) throws -> Dispatcher /// Remove all facets with the given identity from the Active Servant Map. The operation completely removes the Ice /// object, including its default facet. Removing an identity that is not in the map throws @@ -168,11 +155,11 @@ public protocol ObjectAdapter: Swift.AnyObject { /// Remove the default servant for a specific category. Attempting to remove a default servant for a category that /// is not registered throws NotRegisteredException. /// - /// - parameter _: `Swift.String` The category of the default servant to remove. + /// - parameter _: `String` The category of the default servant to remove. /// /// - returns: `Dispatcher` - The default servant. @discardableResult - func removeDefaultServant(_ category: Swift.String) throws -> Dispatcher + func removeDefaultServant(_ category: String) throws -> Dispatcher /// Look up a servant in this object adapter's Active Servant Map by the identity of the Ice object it implements. /// This operation only tries to look up a servant in the Active Servant Map. It does not attempt @@ -189,11 +176,11 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter id: `Identity` The identity of the Ice object for which the servant should be returned. /// - /// - parameter facet: `Swift.String` The facet. An empty facet means the default facet. + /// - parameter facet: `String` The facet. An empty facet means the default facet. /// /// - returns: `Dispatcher?` - The servant that implements the Ice object with the given identity and facet, or null if /// no such servant has been found. - func findFacet(id: Identity, facet: Swift.String) -> Dispatcher? + func findFacet(id: Identity, facet: String) -> Dispatcher? /// Find all facets with the given identity in the Active Servant Map. /// @@ -231,35 +218,35 @@ public protocol ObjectAdapter: Swift.AnyObject { /// /// - parameter locator: `ServantLocator` The locator to add. /// - /// - parameter category: `Swift.String` The category for which the Servant Locator can locate servants, or an + /// - parameter category: `String` The category for which the Servant Locator can locate servants, or an /// empty string if the Servant Locator does not belong to any specific category. - func addServantLocator(locator: ServantLocator, category: Swift.String) throws + func addServantLocator(locator: ServantLocator, category: String) throws /// Remove a Servant Locator from this object adapter. /// - /// - parameter _: `Swift.String` The category for which the Servant Locator can locate servants, or an empty + /// - parameter _: `String` The category for which the Servant Locator can locate servants, or an empty /// string if the Servant Locator does not belong to any specific category. /// /// - returns: `ServantLocator` - The Servant Locator, or throws NotRegisteredException if no Servant Locator was /// found for the given category. @discardableResult - func removeServantLocator(_ category: Swift.String) throws -> ServantLocator + func removeServantLocator(_ category: String) throws -> ServantLocator /// Find a Servant Locator installed with this object adapter. /// - /// - parameter _: `Swift.String` The category for which the Servant Locator can locate servants, or an empty + /// - parameter _: `String` The category for which the Servant Locator can locate servants, or an empty /// string if the Servant Locator does not belong to any specific category. /// /// - returns: `ServantLocator?` - The Servant Locator, or null if no Servant Locator was found for the given /// category. - func findServantLocator(_ category: Swift.String) -> ServantLocator? + func findServantLocator(_ category: String) -> ServantLocator? /// Find the default servant for a specific category. /// - /// - parameter _: `Swift.String` The category of the default servant to find. + /// - parameter _: `String` The category of the default servant to find. /// /// - returns: `Dispatcher?` - The default servant or null if no default servant was registered for the category. - func findDefaultServant(_ category: Swift.String) -> Dispatcher? + func findDefaultServant(_ category: String) -> Dispatcher? /// Create a proxy for the object with the given identity. If this object adapter is configured with an adapter id, /// the return value is an indirect proxy that refers to the adapter id. If a replica group id is also defined, the diff --git a/swift/src/Ice/ObjectAdapterI.swift b/swift/src/Ice/ObjectAdapterI.swift index 2d5b7bb584d..036bee00871 100644 --- a/swift/src/Ice/ObjectAdapterI.swift +++ b/swift/src/Ice/ObjectAdapterI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/OptionalFormat.swift b/swift/src/Ice/OptionalFormat.swift index 8e399125a2f..89522aff515 100644 --- a/swift/src/Ice/OptionalFormat.swift +++ b/swift/src/Ice/OptionalFormat.swift @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. /// Helper for encoding of optional member or parameter. public enum OptionalFormat: UInt8 { case F1 = 0 diff --git a/swift/src/Ice/OutputStream.swift b/swift/src/Ice/OutputStream.swift index 3f4198ce402..1a368e87384 100644 --- a/swift/src/Ice/OutputStream.swift +++ b/swift/src/Ice/OutputStream.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import IceImpl diff --git a/swift/src/Ice/Plugin.swift b/swift/src/Ice/Plugin.swift index fa0d88ec58c..df0b17e350b 100644 --- a/swift/src/Ice/Plugin.swift +++ b/swift/src/Ice/Plugin.swift @@ -1,24 +1,11 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Plugin.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// A communicator plug-in. A plug-in generally adds a feature to a communicator, such as support for a protocol. /// The communicator loads its plug-ins in two stages: the first stage creates the plug-ins, and the second stage /// invokes Plugin.initialize on each one. -public protocol Plugin: Swift.AnyObject { +public protocol Plugin: AnyObject { /// Perform any necessary initialization steps. func initialize() throws @@ -27,7 +14,7 @@ public protocol Plugin: Swift.AnyObject { } /// Each communicator has a plug-in manager to administer the set of plug-ins. -public protocol PluginManager: Swift.AnyObject { +public protocol PluginManager: AnyObject { /// Initialize the configured plug-ins. The communicator automatically initializes the plug-ins by default, but an /// application may need to interact directly with a plug-in prior to initialization. In this case, the application /// must set Ice.InitPlugins=0 and then invoke initializePlugins manually. The plug-ins are @@ -46,25 +33,25 @@ public protocol PluginManager: Swift.AnyObject { /// Obtain a plug-in by name. /// - /// - parameter _: `Swift.String` The plug-in's name. + /// - parameter _: `String` The plug-in's name. /// /// - returns: `Plugin?` - The plug-in. /// /// - throws: /// /// - NotRegisteredException - Raised if no plug-in is found with the given name. - func getPlugin(_ name: Swift.String) throws -> Plugin? + func getPlugin(_ name: String) throws -> Plugin? /// Install a new plug-in. /// - /// - parameter name: `Swift.String` The plug-in's name. + /// - parameter name: `String` The plug-in's name. /// /// - parameter pi: `Plugin?` The plug-in. /// /// - throws: /// /// - AlreadyRegisteredException - Raised if a plug-in already exists with the given name. - func addPlugin(name: Swift.String, pi: Plugin?) throws + func addPlugin(name: String, pi: Plugin?) throws /// Called when the communicator is being destroyed. func destroy() diff --git a/swift/src/Ice/ProcessI.swift b/swift/src/Ice/ProcessI.swift index 7c8cbd3bd6b..b181b51e2c6 100644 --- a/swift/src/Ice/ProcessI.swift +++ b/swift/src/Ice/ProcessI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl @@ -9,7 +7,7 @@ class ProcessI: LocalObject, Process { handle.shutdown() } - func writeMessage(message: Swift.String, fd: Swift.Int32, current _: Current) { + func writeMessage(message: String, fd: Int32, current _: Current) { handle.writeMessage(message, fd: fd) } } diff --git a/swift/src/Ice/Properties.swift b/swift/src/Ice/Properties.swift index 35cbecb47b0..6441596445b 100644 --- a/swift/src/Ice/Properties.swift +++ b/swift/src/Ice/Properties.swift @@ -1,73 +1,60 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `Properties.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// A property set used to configure Ice and Ice applications. Properties are key/value pairs, with both keys and /// values being strings. By convention, property keys should have the form /// application-name[.category[.sub-category]].name. -public protocol Properties: Swift.AnyObject { +public protocol Properties: AnyObject { /// Get a property by key. If the property is not set, an empty string is returned. /// - /// - parameter _: `Swift.String` The property key. + /// - parameter _: `String` The property key. /// - /// - returns: `Swift.String` - The property value. - func getProperty(_ key: Swift.String) -> Swift.String + /// - returns: `String` - The property value. + func getProperty(_ key: String) -> String /// Get an Ice property by key. If the property is not set, its default value is returned. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// - /// - returns: `Swift.String` - The property value or the default value. + /// - returns: `String` - The property value or the default value. /// /// - throws: `NSException` if the key is not a valid Ice property - func getIceProperty(_ key: Swift.String) throws -> Swift.String + func getIceProperty(_ key: String) throws -> String /// Get a property by key. If the property is not set, the given default value is returned. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// - /// - parameter value: `Swift.String` The default value to use if the property does not exist. + /// - parameter value: `String` The default value to use if the property does not exist. /// - /// - returns: `Swift.String` - The property value or the default value. - func getPropertyWithDefault(key: Swift.String, value: Swift.String) -> Swift.String + /// - returns: `String` - The property value or the default value. + func getPropertyWithDefault(key: String, value: String) -> String /// Get a property as an integer. If the property is not set, 0 is returned. /// - /// - parameter _: `Swift.String` The property key. + /// - parameter _: `String` The property key. /// - /// - returns: `Swift.Int32` - The property value interpreted as an integer. - func getPropertyAsInt(_ key: Swift.String) -> Swift.Int32 + /// - returns: `Int32` - The property value interpreted as an integer. + func getPropertyAsInt(_ key: String) -> Int32 /// Get an Ice property as an integer. If the property is not set,its default value is returned. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// - /// - returns: `Swift.Int32` - The property value interpreted as an integer, or the default value. + /// - returns: `Int32` - The property value interpreted as an integer, or the default value. /// /// - throws: `NSException` if the key is not a valid Ice property - func getIcePropertyAsInt(_ key: Swift.String) throws -> Swift.Int32 + func getIcePropertyAsInt(_ key: String) throws -> Int32 /// Get a property as an integer. If the property is not set, the given default value is returned. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// - /// - parameter value: `Swift.Int32` The default value to use if the property does not exist. + /// - parameter value: `Int32` The default value to use if the property does not exist. /// - /// - returns: `Swift.Int32` - The property value interpreted as an integer, or the default value. - func getPropertyAsIntWithDefault(key: Swift.String, value: Swift.Int32) -> Swift.Int32 + /// - returns: `Int32` - The property value interpreted as an integer, or the default value. + func getPropertyAsIntWithDefault(key: String, value: Int32) -> Int32 /// Get a property as a list of strings. The strings must be separated by whitespace or comma. If the property is /// not set, an empty list is returned. The strings in the list can contain whitespace and commas if they are @@ -75,10 +62,10 @@ public protocol Properties: Swift.AnyObject { /// or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as /// O'Reilly, "O'Reilly" or 'O\'Reilly'. /// - /// - parameter _: `Swift.String` The property key. + /// - parameter _: `String` The property key. /// /// - returns: `StringSeq` - The property value interpreted as a list of strings. - func getPropertyAsList(_ key: Swift.String) -> StringSeq + func getPropertyAsList(_ key: String) -> StringSeq /// Get an Ice property as a list of strings. The strings must be separated by whitespace or comma. If the property /// is not set, its default list is returned. The strings in the list can contain whitespace and commas if they are @@ -86,12 +73,12 @@ public protocol Properties: Swift.AnyObject { /// quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as /// O'Reilly, "O'Reilly" or 'O\'Reilly'. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// /// - returns: `StringSeq` - The property value interpreted as list of strings, or the default value. /// /// - throws: `NSException` if the key is not a valid Ice property - func getIcePropertyAsList(_ key: Swift.String) throws -> StringSeq + func getIcePropertyAsList(_ key: String) throws -> StringSeq /// Get a property as a list of strings. The strings must be separated by whitespace or comma. If the property is /// not set, the default list is returned. The strings in the list can contain whitespace and commas if they are @@ -99,27 +86,27 @@ public protocol Properties: Swift.AnyObject { /// quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as /// O'Reilly, "O'Reilly" or 'O\'Reilly'. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// /// - parameter value: `StringSeq` The default value to use if the property is not set. /// /// - returns: `StringSeq` - The property value interpreted as list of strings, or the default value. - func getPropertyAsListWithDefault(key: Swift.String, value: StringSeq) -> StringSeq + func getPropertyAsListWithDefault(key: String, value: StringSeq) -> StringSeq /// Get all properties whose keys begins with prefix. If prefix is an empty string, then all /// properties are returned. /// - /// - parameter _: `Swift.String` The prefix to search for (empty string if none). + /// - parameter _: `String` The prefix to search for (empty string if none). /// /// - returns: `PropertyDict` - The matching property set. - func getPropertiesForPrefix(_ prefix: Swift.String) -> PropertyDict + func getPropertiesForPrefix(_ prefix: String) -> PropertyDict /// Set a property. To unset a property, set it to the empty string. /// - /// - parameter key: `Swift.String` The property key. + /// - parameter key: `String` The property key. /// - /// - parameter value: `Swift.String` The property value. - func setProperty(key: Swift.String, value: Swift.String) + /// - parameter value: `String` The property value. + func setProperty(key: String, value: String) /// Get a sequence of command-line options that is equivalent to this property set. Each element of the returned /// sequence is a command-line option of the form --key=value. @@ -131,14 +118,14 @@ public protocol Properties: Swift.AnyObject { /// --prefix. are converted into properties. If the prefix is empty, all options that begin with /// -- are converted to properties. /// - /// - parameter prefix: `Swift.String` The property prefix, or an empty string to convert all options starting + /// - parameter prefix: `String` The property prefix, or an empty string to convert all options starting /// with --. /// /// - parameter options: `StringSeq` The command-line options. /// /// - returns: `StringSeq` - The command-line options that do not start with the specified prefix, in their /// original order. - func parseCommandLineOptions(prefix: Swift.String, options: StringSeq) throws -> StringSeq + func parseCommandLineOptions(prefix: String, options: StringSeq) throws -> StringSeq /// Convert a sequence of command-line options into properties. All options that begin with one of the following /// prefixes are converted into properties: --Ice, --IceBox, --IceGrid, @@ -152,8 +139,8 @@ public protocol Properties: Swift.AnyObject { /// Load properties from a file. /// - /// - parameter _: `Swift.String` The property file. - func load(_ file: Swift.String) throws + /// - parameter _: `String` The property file. + func load(_ file: String) throws /// Create a copy of this property set. /// diff --git a/swift/src/Ice/PropertiesAdminI.swift b/swift/src/Ice/PropertiesAdminI.swift index a9e2fabeb43..0e71feabc1d 100644 --- a/swift/src/Ice/PropertiesAdminI.swift +++ b/swift/src/Ice/PropertiesAdminI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl @@ -12,13 +10,13 @@ class PropertiesAdminI: LocalObject, PropertiesAdmin, Native super.init(handle: handle) } - func getProperty(key: Swift.String, current _: Current) throws -> Swift.String { + func getProperty(key: String, current _: Current) throws -> String { return try autoreleasepool { try handle.getProperty(key) } } - func getPropertiesForPrefix(prefix: Swift.String, current _: Current) throws -> PropertyDict { + func getPropertiesForPrefix(prefix: String, current _: Current) throws -> PropertyDict { return try autoreleasepool { try handle.getPropertiesForPrefix(prefix) } diff --git a/swift/src/Ice/PropertiesI.swift b/swift/src/Ice/PropertiesI.swift index 0288d40af58..f11f476dc37 100644 --- a/swift/src/Ice/PropertiesI.swift +++ b/swift/src/Ice/PropertiesI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import IceImpl diff --git a/swift/src/Ice/Proxy.swift b/swift/src/Ice/Proxy.swift index 40e8a778d84..34b599173e1 100644 --- a/swift/src/Ice/Proxy.swift +++ b/swift/src/Ice/Proxy.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import IceImpl @@ -350,7 +348,7 @@ public func uncheckedCast( /// Returns the Slice type id of the interface or class associated with this proxy class. /// /// - returns: `String` - The type id, "::Ice::Object". -public func ice_staticId(_: ObjectPrx.Protocol) -> Swift.String { +public func ice_staticId(_: ObjectPrx.Protocol) -> String { return ObjectTraits.staticId } @@ -401,7 +399,7 @@ extension ObjectPrx { /// - parameter sentFlags: `Dispatch.DispatchWorkItemFlags` - Optional dispatch flags used to /// dispatch sent callback /// - /// - parameter sent: `((Swift.Bool) -> Swift.Void)` - Optional sent callback. + /// - parameter sent: `((Bool) -> Void)` - Optional sent callback. /// /// - returns: `PromiseKit.Promise` - A promise object that will be resolved with /// the result of the invocation. diff --git a/swift/src/Ice/SSLConnectionInfo.swift b/swift/src/Ice/SSLConnectionInfo.swift index 07e0b98d457..e2bfc244e3f 100644 --- a/swift/src/Ice/SSLConnectionInfo.swift +++ b/swift/src/Ice/SSLConnectionInfo.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/SSLEndpointInfo.swift b/swift/src/Ice/SSLEndpointInfo.swift index 53d1b5b615f..44cccce95ff 100644 --- a/swift/src/Ice/SSLEndpointInfo.swift +++ b/swift/src/Ice/SSLEndpointInfo.swift @@ -1,17 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `EndpointInfo.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/ServantLocator.swift b/swift/src/Ice/ServantLocator.swift index 0f012207676..6b86947323f 100644 --- a/swift/src/Ice/ServantLocator.swift +++ b/swift/src/Ice/ServantLocator.swift @@ -1,22 +1,9 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `ServantLocator.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation /// A servant locator is called by an object adapter to locate a servant that is not found in its active servant map. -public protocol ServantLocator: Swift.AnyObject { +public protocol ServantLocator: AnyObject { /// Called before a request is dispatched if a servant cannot be found in the object adapter's active servant map. /// Note that the object adapter does not automatically insert the returned servant into its active servant map. /// This must be done by the servant locator implementation, if this is desired. locate can throw any @@ -30,17 +17,17 @@ public protocol ServantLocator: Swift.AnyObject { /// /// - parameter _: `Current` Information about the current operation for which a servant is required. /// - /// - returns: `(returnValue: Dispatcher?, cookie: Swift.AnyObject?)`: + /// - returns: `(returnValue: Dispatcher?, cookie: AnyObject?)`: /// /// - returnValue: `Dispatcher?` - The located servant, or null if no suitable servant has been found. /// - /// - cookie: `Swift.AnyObject?` - A "cookie" that will be passed to finished. + /// - cookie: `AnyObject?` - A "cookie" that will be passed to finished. /// /// - throws: /// /// - UserException - The implementation can raise a UserException and the run time will marshal it as the /// result of the invocation. - func locate(_ curr: Current) throws -> (returnValue: Dispatcher?, cookie: Swift.AnyObject?) + func locate(_ curr: Current) throws -> (returnValue: Dispatcher?, cookie: AnyObject?) /// Called by the object adapter after a request has been made. This operation is only called if /// locate was called prior to the request and returned a non-null servant. This operation can be used @@ -56,16 +43,16 @@ public protocol ServantLocator: Swift.AnyObject { /// /// - parameter servant: `Dispatcher` The servant that was returned by locate. /// - /// - parameter cookie: `Swift.AnyObject?` The cookie that was returned by locate. + /// - parameter cookie: `AnyObject?` The cookie that was returned by locate. /// /// - throws: /// /// - UserException - The implementation can raise a UserException and the run time will marshal it as the /// result of the invocation. - func finished(curr: Current, servant: Dispatcher, cookie: Swift.AnyObject?) throws + func finished(curr: Current, servant: Dispatcher, cookie: AnyObject?) throws /// Called when the object adapter in which this servant locator is installed is destroyed. /// - /// - parameter _: `Swift.String` Indicates for which category the servant locator is being deactivated. - func deactivate(_ category: Swift.String) + /// - parameter _: `String` Indicates for which category the servant locator is being deactivated. + func deactivate(_ category: String) } diff --git a/swift/src/Ice/ServantManager.swift b/swift/src/Ice/ServantManager.swift index bad21dfa20d..d6a13378788 100644 --- a/swift/src/Ice/ServantManager.swift +++ b/swift/src/Ice/ServantManager.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import PromiseKit diff --git a/swift/src/Ice/SliceFlags.swift b/swift/src/Ice/SliceFlags.swift index 6b5e9bc6193..a1405abc7f6 100644 --- a/swift/src/Ice/SliceFlags.swift +++ b/swift/src/Ice/SliceFlags.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. struct SliceFlags: OptionSet { let rawValue: UInt8 diff --git a/swift/src/Ice/SliceInfo.swift b/swift/src/Ice/SliceInfo.swift index ee6549ee162..44896af21e1 100644 --- a/swift/src/Ice/SliceInfo.swift +++ b/swift/src/Ice/SliceInfo.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation diff --git a/swift/src/Ice/SlicedData.swift b/swift/src/Ice/SlicedData.swift index a018220ff89..d3d449e8616 100644 --- a/swift/src/Ice/SlicedData.swift +++ b/swift/src/Ice/SlicedData.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. /// SlicedData holds the slices of unknown class or exception types. public final class SlicedData { diff --git a/swift/src/Ice/ToStringMode.swift b/swift/src/Ice/ToStringMode.swift new file mode 100644 index 00000000000..ad2ef51c179 --- /dev/null +++ b/swift/src/Ice/ToStringMode.swift @@ -0,0 +1,73 @@ +// Copyright (c) ZeroC, Inc. + +import Foundation + +/// The output mode for xxxToString method such as identityToString and proxyToString. The actual encoding format for +/// the string is the same for all modes: you don't need to specify an encoding format or mode when reading such a +/// string. +public enum ToStringMode: UInt8 { + /// Unicode Characters with ordinal values greater than 127 are kept as-is in the resulting string. Non-printable + /// ASCII characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. + case Unicode = 0 + /// ASCII Characters with ordinal values greater than 127 are encoded as universal character names in the resulting + /// string: \\unnnn for BMP characters and \\Unnnnnnnn for non-BMP characters. Non-printable ASCII characters + /// with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. + case ASCII = 1 + /// Compat Characters with ordinal values greater than 127 are encoded as a sequence of UTF-8 bytes using octal + /// escapes. + /// Characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or an octal escape. Use this mode + /// to generate strings compatible with Ice 3.6 and earlier. + case Compat = 2 + + public init() { + self = .Unicode + } +} + +/// An `Ice.InputStream` extension to read `ToStringMode` enumerated values from the stream. +extension InputStream { + /// Read an enumerated value. + /// + /// - returns: `ToStringMode` - The enumarated value. + public func read() throws -> ToStringMode { + let rawValue: UInt8 = try read(enumMaxValue: 2) + guard let val = ToStringMode(rawValue: rawValue) else { + throw MarshalException(reason: "invalid enum value") + } + return val + } + + /// Read an optional enumerated value from the stream. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - returns: `ToStringMode` - The enumerated value. + public func read(tag: Int32) throws -> ToStringMode? { + guard try readOptional(tag: tag, expectedFormat: .Size) else { + return nil + } + return try read() as ToStringMode + } +} + +/// An `Ice.OutputStream` extension to write `ToStringMode` enumerated values to the stream. +extension OutputStream { + /// Writes an enumerated value to the stream. + /// + /// parameter _: `ToStringMode` - The enumerator to write. + public func write(_ v: ToStringMode) { + write(enum: v.rawValue, maxValue: 2) + } + + /// Writes an optional enumerated value to the stream. + /// + /// parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// parameter _: `ToStringMode` - The enumerator to write. + public func write(tag: Int32, value: ToStringMode?) { + guard let v = value else { + return + } + write(tag: tag, val: v.rawValue, maxValue: 2) + } +} diff --git a/swift/src/Ice/UnknownSlicedValue.swift b/swift/src/Ice/UnknownSlicedValue.swift index adf84acb01f..a20536d915e 100644 --- a/swift/src/Ice/UnknownSlicedValue.swift +++ b/swift/src/Ice/UnknownSlicedValue.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. /// Unknown sliced value holds an instance of an unknown Slice class type. public final class UnknownSlicedValue: Value { diff --git a/swift/src/Ice/Util.swift b/swift/src/Ice/Util.swift index 4235c8f903a..396146c9def 100644 --- a/swift/src/Ice/Util.swift +++ b/swift/src/Ice/Util.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import IceImpl diff --git a/swift/src/Ice/Value.swift b/swift/src/Ice/Value.swift index d12b2496e42..62a39b763a0 100644 --- a/swift/src/Ice/Value.swift +++ b/swift/src/Ice/Value.swift @@ -1,8 +1,6 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. -// The base class for all Ice values. +/// The base class for all Ice values. open class Value { private var slicedData: SlicedData? diff --git a/swift/src/Ice/ValueFactory.swift b/swift/src/Ice/ValueFactory.swift index 192d56a9004..c9c5f527d21 100644 --- a/swift/src/Ice/ValueFactory.swift +++ b/swift/src/Ice/ValueFactory.swift @@ -1,17 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// -// -// Ice version 3.7.10 -// -// -// -// Generated from file `ValueFactory.ice' -// -// Warning: do not edit this file. -// -// -// +// Copyright (c) ZeroC, Inc. import Foundation @@ -24,14 +11,14 @@ import Foundation /// the module Foo is "::Foo::Bar". /// Note that the leading "::" is required. /// -/// - parameter _: `Swift.String` The value type. +/// - parameter _: `String` The value type. /// /// - returns: `Value?` - The value created for the given type, or nil if the factory is unable to create the value. -public typealias ValueFactory = (Swift.String) -> Value? +public typealias ValueFactory = (String) -> Value? /// A value factory manager maintains a collection of value factories. An application can supply a custom /// implementation during communicator initialization, otherwise Ice provides a default implementation. -public protocol ValueFactoryManager: Swift.AnyObject { +public protocol ValueFactoryManager: AnyObject { /// Add a value factory. Attempting to add a factory with an id for which a factory is already registered throws /// AlreadyRegisteredException. /// When unmarshaling an Ice value, the Ice run time reads the most-derived type id off the wire and attempts to @@ -52,15 +39,15 @@ public protocol ValueFactoryManager: Swift.AnyObject { /// /// - parameter factory: `@escaping ValueFactory` The factory to add. /// - /// - parameter id: `Swift.String` The type id for which the factory can create instances, or an empty string for + /// - parameter id: `String` The type id for which the factory can create instances, or an empty string for /// the default factory. - func add(factory: @escaping ValueFactory, id: Swift.String) throws + func add(factory: @escaping ValueFactory, id: String) throws /// Find an value factory registered with this communicator. /// - /// - parameter _: `Swift.String` The type id for which the factory can create instances, or an empty string for + /// - parameter _: `String` The type id for which the factory can create instances, or an empty string for /// the default factory. /// /// - returns: `ValueFactory?` - The value factory, or null if no value factory was found for the given id. - func find(_ id: Swift.String) -> ValueFactory? + func find(_ id: String) -> ValueFactory? } diff --git a/swift/src/Ice/ValueFactoryManagerI.swift b/swift/src/Ice/ValueFactoryManagerI.swift index e2fd8e61c9e..d2bd6eba87a 100644 --- a/swift/src/Ice/ValueFactoryManagerI.swift +++ b/swift/src/Ice/ValueFactoryManagerI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. class ValueFactoryManagerI: ValueFactoryManager { private var factories = [String: ValueFactory]() diff --git a/swift/src/IceGrid/IceGridSwift.h b/swift/src/IceGrid/IceGridSwift.h index 491f3945e88..ae2be8c02f3 100644 --- a/swift/src/IceGrid/IceGridSwift.h +++ b/swift/src/IceGrid/IceGridSwift.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import FOUNDATION_EXPORT double Glacier2VersionNumber; diff --git a/swift/src/IceImpl/AdminFacetFactory.h b/swift/src/IceImpl/AdminFacetFactory.h index 0a8017e980a..178de53e81b 100644 --- a/swift/src/IceImpl/AdminFacetFactory.h +++ b/swift/src/IceImpl/AdminFacetFactory.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" @class ICECommunicator; diff --git a/swift/src/IceImpl/Communicator.h b/swift/src/IceImpl/Communicator.h index cbd214f6585..95be6055577 100644 --- a/swift/src/IceImpl/Communicator.h +++ b/swift/src/IceImpl/Communicator.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" @class ICEObjectPrx; diff --git a/swift/src/IceImpl/Communicator.mm b/swift/src/IceImpl/Communicator.mm index 2fb9523ded5..088674d3dcf 100644 --- a/swift/src/IceImpl/Communicator.mm +++ b/swift/src/IceImpl/Communicator.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Communicator.h" #import "DispatchAdapter.h" #import "IceUtil.h" diff --git a/swift/src/IceImpl/Config.h b/swift/src/IceImpl/Config.h index 8acee523b5f..bc167c103d0 100644 --- a/swift/src/IceImpl/Config.h +++ b/swift/src/IceImpl/Config.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import #ifndef ICEIMPL_API diff --git a/swift/src/IceImpl/Connection.h b/swift/src/IceImpl/Connection.h index 6ac8143b006..a63f5c0aba1 100644 --- a/swift/src/IceImpl/Connection.h +++ b/swift/src/IceImpl/Connection.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" @class ICEObjectPrx; diff --git a/swift/src/IceImpl/Connection.mm b/swift/src/IceImpl/Connection.mm index dcc0120f25c..3a8ea08813b 100644 --- a/swift/src/IceImpl/Connection.mm +++ b/swift/src/IceImpl/Connection.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Connection.h" #import "../../cpp/src/Ice/SSL/SSLUtil.h" #import "Convert.h" diff --git a/swift/src/IceImpl/Convert.h b/swift/src/IceImpl/Convert.h index 2bb21c9188c..36f42b0e356 100644 --- a/swift/src/IceImpl/Convert.h +++ b/swift/src/IceImpl/Convert.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" #include diff --git a/swift/src/IceImpl/Convert.mm b/swift/src/IceImpl/Convert.mm index 4d78d2ca5d2..09412a0b336 100644 --- a/swift/src/IceImpl/Convert.mm +++ b/swift/src/IceImpl/Convert.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Convert.h" #import "Exception.h" #import "IceUtil.h" diff --git a/swift/src/IceImpl/DispatchAdapter.h b/swift/src/IceImpl/DispatchAdapter.h index 0de33b7569a..1da9d53bc2e 100644 --- a/swift/src/IceImpl/DispatchAdapter.h +++ b/swift/src/IceImpl/DispatchAdapter.h @@ -1,5 +1,4 @@ // Copyright (c) ZeroC, Inc. - #import "Config.h" @class ICEConnection; diff --git a/swift/src/IceImpl/DispatchAdapter.mm b/swift/src/IceImpl/DispatchAdapter.mm index 206bdadcfc3..ce8826ef9ab 100644 --- a/swift/src/IceImpl/DispatchAdapter.mm +++ b/swift/src/IceImpl/DispatchAdapter.mm @@ -1,5 +1,4 @@ // Copyright (c) ZeroC, Inc. - #import "DispatchAdapter.h" #import "Connection.h" #import "Convert.h" diff --git a/swift/src/IceImpl/Endpoint.h b/swift/src/IceImpl/Endpoint.h index 2c4388725b3..a831317549b 100644 --- a/swift/src/IceImpl/Endpoint.h +++ b/swift/src/IceImpl/Endpoint.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/Endpoint.mm b/swift/src/IceImpl/Endpoint.mm index be606dd9437..5bc11739b73 100644 --- a/swift/src/IceImpl/Endpoint.mm +++ b/swift/src/IceImpl/Endpoint.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Endpoint.h" #import "Convert.h" #import "IceUtil.h" diff --git a/swift/src/IceImpl/Exception.h b/swift/src/IceImpl/Exception.h index 8a726f0ba36..07a739907fc 100644 --- a/swift/src/IceImpl/Exception.h +++ b/swift/src/IceImpl/Exception.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Config.h" #import diff --git a/swift/src/IceImpl/IceUtil.h b/swift/src/IceImpl/IceUtil.h index fbf71a87e59..cf15925be31 100644 --- a/swift/src/IceImpl/IceUtil.h +++ b/swift/src/IceImpl/IceUtil.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "AdminFacetFactory.h" #import "Communicator.h" #import "Connection.h" diff --git a/swift/src/IceImpl/IceUtil.mm b/swift/src/IceImpl/IceUtil.mm index da736623bb8..e23aad2adf5 100644 --- a/swift/src/IceImpl/IceUtil.mm +++ b/swift/src/IceImpl/IceUtil.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "IceUtil.h" #import "Convert.h" #import "Logger.h" diff --git a/swift/src/IceImpl/ImplicitContext.h b/swift/src/IceImpl/ImplicitContext.h index 6b17dd0d38e..b2aaea6fefa 100644 --- a/swift/src/IceImpl/ImplicitContext.h +++ b/swift/src/IceImpl/ImplicitContext.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/ImplicitContext.mm b/swift/src/IceImpl/ImplicitContext.mm index 10fefaa1d82..d65a17ece37 100644 --- a/swift/src/IceImpl/ImplicitContext.mm +++ b/swift/src/IceImpl/ImplicitContext.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "ImplicitContext.h" #import "Convert.h" diff --git a/swift/src/IceImpl/LocalObject.h b/swift/src/IceImpl/LocalObject.h index 4e047170f57..fec80ff1158 100644 --- a/swift/src/IceImpl/LocalObject.h +++ b/swift/src/IceImpl/LocalObject.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Config.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/LocalObject.mm b/swift/src/IceImpl/LocalObject.mm index 26774a5d98b..ea558b0c78f 100644 --- a/swift/src/IceImpl/LocalObject.mm +++ b/swift/src/IceImpl/LocalObject.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #include #import "LocalObject.h" diff --git a/swift/src/IceImpl/Logger.h b/swift/src/IceImpl/Logger.h index 100d6656963..74c04e2db0c 100644 --- a/swift/src/IceImpl/Logger.h +++ b/swift/src/IceImpl/Logger.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/Logger.mm b/swift/src/IceImpl/Logger.mm index 62b1f3d6f0d..c9872d8860f 100644 --- a/swift/src/IceImpl/Logger.mm +++ b/swift/src/IceImpl/Logger.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Logger.h" #import "Convert.h" diff --git a/swift/src/IceImpl/LoggerWrapperI.h b/swift/src/IceImpl/LoggerWrapperI.h index 46537ec0924..b69783ce935 100644 --- a/swift/src/IceImpl/LoggerWrapperI.h +++ b/swift/src/IceImpl/LoggerWrapperI.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Convert.h" class LoggerWrapperI : public Ice::Logger diff --git a/swift/src/IceImpl/ObjectAdapter.h b/swift/src/IceImpl/ObjectAdapter.h index 1445112d9c3..a3bc999a632 100644 --- a/swift/src/IceImpl/ObjectAdapter.h +++ b/swift/src/IceImpl/ObjectAdapter.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" @class ICECommunicator; diff --git a/swift/src/IceImpl/ObjectAdapter.mm b/swift/src/IceImpl/ObjectAdapter.mm index f41a4f37df2..4e782185bf2 100644 --- a/swift/src/IceImpl/ObjectAdapter.mm +++ b/swift/src/IceImpl/ObjectAdapter.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "ObjectAdapter.h" #import "Communicator.h" #import "Config.h" diff --git a/swift/src/IceImpl/ObjectPrx.h b/swift/src/IceImpl/ObjectPrx.h index 0d060b45ed3..b8e867321f9 100644 --- a/swift/src/IceImpl/ObjectPrx.h +++ b/swift/src/IceImpl/ObjectPrx.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Config.h" @class ICEObjectPrx; diff --git a/swift/src/IceImpl/ObjectPrx.mm b/swift/src/IceImpl/ObjectPrx.mm index 3b03600f57c..ac9fcf88b00 100644 --- a/swift/src/IceImpl/ObjectPrx.mm +++ b/swift/src/IceImpl/ObjectPrx.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "ObjectPrx.h" #import "Communicator.h" diff --git a/swift/src/IceImpl/OutputStream.h b/swift/src/IceImpl/OutputStream.h index d05b42f41dc..aa296248bb4 100644 --- a/swift/src/IceImpl/OutputStream.h +++ b/swift/src/IceImpl/OutputStream.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/Process.h b/swift/src/IceImpl/Process.h index c41817abae2..70a05c9381e 100644 --- a/swift/src/IceImpl/Process.h +++ b/swift/src/IceImpl/Process.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/Process.mm b/swift/src/IceImpl/Process.mm index a54ab6f5a1e..48b9aa6fab1 100644 --- a/swift/src/IceImpl/Process.mm +++ b/swift/src/IceImpl/Process.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Process.h" #import "Convert.h" diff --git a/swift/src/IceImpl/Properties.h b/swift/src/IceImpl/Properties.h index 13a55ad9093..5c7fe19706a 100644 --- a/swift/src/IceImpl/Properties.h +++ b/swift/src/IceImpl/Properties.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/Properties.mm b/swift/src/IceImpl/Properties.mm index 01525ad4a9b..6bd29b30bfc 100644 --- a/swift/src/IceImpl/Properties.mm +++ b/swift/src/IceImpl/Properties.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Properties.h" #import "Convert.h" diff --git a/swift/src/IceImpl/PropertiesAdmin.h b/swift/src/IceImpl/PropertiesAdmin.h index f30c1065b6a..d014ebfe7e0 100644 --- a/swift/src/IceImpl/PropertiesAdmin.h +++ b/swift/src/IceImpl/PropertiesAdmin.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/PropertiesAdmin.mm b/swift/src/IceImpl/PropertiesAdmin.mm index 2075ce02cee..42af0c59704 100644 --- a/swift/src/IceImpl/PropertiesAdmin.mm +++ b/swift/src/IceImpl/PropertiesAdmin.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "PropertiesAdmin.h" #import "Convert.h" diff --git a/swift/src/IceImpl/TraceUtil.h b/swift/src/IceImpl/TraceUtil.h index d8bafbd3ca4..c638f0f2fd7 100644 --- a/swift/src/IceImpl/TraceUtil.h +++ b/swift/src/IceImpl/TraceUtil.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "Logger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/TraceUtil.mm b/swift/src/IceImpl/TraceUtil.mm index b9d73ce022b..c2e65934359 100644 --- a/swift/src/IceImpl/TraceUtil.mm +++ b/swift/src/IceImpl/TraceUtil.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "TraceUtil.h" #import "Ice/TraceUtil.h" diff --git a/swift/src/IceImpl/UnsupportedAdminFacet.h b/swift/src/IceImpl/UnsupportedAdminFacet.h index 4af5585667d..cd7c7aae993 100644 --- a/swift/src/IceImpl/UnsupportedAdminFacet.h +++ b/swift/src/IceImpl/UnsupportedAdminFacet.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "LocalObject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/swift/src/IceImpl/UnsupportedAdminFacet.mm b/swift/src/IceImpl/UnsupportedAdminFacet.mm index d84bc10f1a1..cc9f033617b 100644 --- a/swift/src/IceImpl/UnsupportedAdminFacet.mm +++ b/swift/src/IceImpl/UnsupportedAdminFacet.mm @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import "UnsupportedAdminFacet.h" @implementation ICEUnsupportedAdminFacet diff --git a/swift/src/IceStorm/IceStormSwift.h b/swift/src/IceStorm/IceStormSwift.h index 491f3945e88..ae2be8c02f3 100644 --- a/swift/src/IceStorm/IceStormSwift.h +++ b/swift/src/IceStorm/IceStormSwift.h @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #import FOUNDATION_EXPORT double Glacier2VersionNumber; diff --git a/swift/test/Ice/adapterDeactivation/AllTests.swift b/swift/test/Ice/adapterDeactivation/AllTests.swift index 6bf9501d0a2..c1417b3fd64 100644 --- a/swift/test/Ice/adapterDeactivation/AllTests.swift +++ b/swift/test/Ice/adapterDeactivation/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/adapterDeactivation/Client.swift b/swift/test/Ice/adapterDeactivation/Client.swift index cbca6f8fce7..72f813583a4 100644 --- a/swift/test/Ice/adapterDeactivation/Client.swift +++ b/swift/test/Ice/adapterDeactivation/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/adapterDeactivation/Collocated.swift b/swift/test/Ice/adapterDeactivation/Collocated.swift index 1f96d2781ef..765703ec6b3 100644 --- a/swift/test/Ice/adapterDeactivation/Collocated.swift +++ b/swift/test/Ice/adapterDeactivation/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/adapterDeactivation/Server.swift b/swift/test/Ice/adapterDeactivation/Server.swift index afdd6146ba3..5db1baa477e 100644 --- a/swift/test/Ice/adapterDeactivation/Server.swift +++ b/swift/test/Ice/adapterDeactivation/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/adapterDeactivation/Test.ice b/swift/test/Ice/adapterDeactivation/Test.ice index 1f4ce816656..8b0caa7b61b 100644 --- a/swift/test/Ice/adapterDeactivation/Test.ice +++ b/swift/test/Ice/adapterDeactivation/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/adapterDeactivation/TestI.swift b/swift/test/Ice/adapterDeactivation/TestI.swift index 77e057e562e..6b19a76b9ea 100644 --- a/swift/test/Ice/adapterDeactivation/TestI.swift +++ b/swift/test/Ice/adapterDeactivation/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice @@ -83,7 +81,7 @@ class ServantLocatorI: Ice.ServantLocator { return (TestIntfDisp(TestI()), Cookie()) } - func finished(curr current: Ice.Current, servant _: Ice.Dispatcher, cookie: Swift.AnyObject?) throws { + func finished(curr current: Ice.Current, servant _: Ice.Dispatcher, cookie: AnyObject?) throws { try withLock(&_lock) { try _helper.test(!_deactivated) } diff --git a/swift/test/Ice/admin/AllTests.swift b/swift/test/Ice/admin/AllTests.swift index 4f52534c280..64a63431519 100644 --- a/swift/test/Ice/admin/AllTests.swift +++ b/swift/test/Ice/admin/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/admin/Client.swift b/swift/test/Ice/admin/Client.swift index 99339296743..2d597282441 100644 --- a/swift/test/Ice/admin/Client.swift +++ b/swift/test/Ice/admin/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/admin/Server.swift b/swift/test/Ice/admin/Server.swift index fd4c4049da5..474ec15aab7 100644 --- a/swift/test/Ice/admin/Server.swift +++ b/swift/test/Ice/admin/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/admin/Test.ice b/swift/test/Ice/admin/Test.ice index e44d3b6034d..b25a9631c36 100644 --- a/swift/test/Ice/admin/Test.ice +++ b/swift/test/Ice/admin/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #ifndef TEST_ICE #define TEST_ICE diff --git a/swift/test/Ice/admin/TestI.swift b/swift/test/Ice/admin/TestI.swift index 66ad47a659b..c6572e10ca5 100644 --- a/swift/test/Ice/admin/TestI.swift +++ b/swift/test/Ice/admin/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/ami/AllTests.swift b/swift/test/Ice/ami/AllTests.swift index 3679f1d06e5..8c6a79a0b54 100644 --- a/swift/test/Ice/ami/AllTests.swift +++ b/swift/test/Ice/ami/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/ami/Client.swift b/swift/test/Ice/ami/Client.swift index 99339296743..2d597282441 100644 --- a/swift/test/Ice/ami/Client.swift +++ b/swift/test/Ice/ami/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/ami/Collocated.swift b/swift/test/Ice/ami/Collocated.swift index 776e408125e..f36dc351d31 100644 --- a/swift/test/Ice/ami/Collocated.swift +++ b/swift/test/Ice/ami/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/ami/Server.swift b/swift/test/Ice/ami/Server.swift index a35d82230d0..fc16808bdd0 100644 --- a/swift/test/Ice/ami/Server.swift +++ b/swift/test/Ice/ami/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/ami/Test.ice b/swift/test/Ice/ami/Test.ice index a61714780df..0051a61ec3e 100644 --- a/swift/test/Ice/ami/Test.ice +++ b/swift/test/Ice/ami/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/BuiltinSequences.ice" diff --git a/swift/test/Ice/ami/TestI.swift b/swift/test/Ice/ami/TestI.swift index 4f33ce06190..f103a595a0b 100644 --- a/swift/test/Ice/ami/TestI.swift +++ b/swift/test/Ice/ami/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/binding/AllTests.swift b/swift/test/Ice/binding/AllTests.swift index 4c7795144ab..5391ea46d5d 100644 --- a/swift/test/Ice/binding/AllTests.swift +++ b/swift/test/Ice/binding/AllTests.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice import TestCommon diff --git a/swift/test/Ice/binding/Client.swift b/swift/test/Ice/binding/Client.swift index 99339296743..2d597282441 100644 --- a/swift/test/Ice/binding/Client.swift +++ b/swift/test/Ice/binding/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/binding/Server.swift b/swift/test/Ice/binding/Server.swift index e75c76d3de7..2a7c631042f 100644 --- a/swift/test/Ice/binding/Server.swift +++ b/swift/test/Ice/binding/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/binding/Test.ice b/swift/test/Ice/binding/Test.ice index a93e5cc08d9..56de0d11aaf 100644 --- a/swift/test/Ice/binding/Test.ice +++ b/swift/test/Ice/binding/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/binding/TestI.swift b/swift/test/Ice/binding/TestI.swift index 6500fa1ea22..f1e41653ba2 100644 --- a/swift/test/Ice/binding/TestI.swift +++ b/swift/test/Ice/binding/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/defaultServant/AllTests.swift b/swift/test/Ice/defaultServant/AllTests.swift index 54042cf14a9..d020430a5cb 100644 --- a/swift/test/Ice/defaultServant/AllTests.swift +++ b/swift/test/Ice/defaultServant/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/defaultServant/Client.swift b/swift/test/Ice/defaultServant/Client.swift index 99339296743..2d597282441 100644 --- a/swift/test/Ice/defaultServant/Client.swift +++ b/swift/test/Ice/defaultServant/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/defaultServant/Test.ice b/swift/test/Ice/defaultServant/Test.ice index db13e864bd8..dc1170d1ecb 100644 --- a/swift/test/Ice/defaultServant/Test.ice +++ b/swift/test/Ice/defaultServant/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/defaultValue/AllTests.swift b/swift/test/Ice/defaultValue/AllTests.swift index 680106568ce..aef79d7a7fb 100644 --- a/swift/test/Ice/defaultValue/AllTests.swift +++ b/swift/test/Ice/defaultValue/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/defaultValue/Client.swift b/swift/test/Ice/defaultValue/Client.swift index c915169e122..24fb8c73af9 100644 --- a/swift/test/Ice/defaultValue/Client.swift +++ b/swift/test/Ice/defaultValue/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/defaultValue/Test.ice b/swift/test/Ice/defaultValue/Test.ice index ee09af7bd28..eb7bc400de8 100644 --- a/swift/test/Ice/defaultValue/Test.ice +++ b/swift/test/Ice/defaultValue/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceDefaultValue"]] diff --git a/swift/test/Ice/enums/AllTests.swift b/swift/test/Ice/enums/AllTests.swift index 6c70ddcb907..045a0541ae8 100644 --- a/swift/test/Ice/enums/AllTests.swift +++ b/swift/test/Ice/enums/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/enums/Client.swift b/swift/test/Ice/enums/Client.swift index 50daed44899..17ecc794088 100644 --- a/swift/test/Ice/enums/Client.swift +++ b/swift/test/Ice/enums/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/enums/Server.swift b/swift/test/Ice/enums/Server.swift index f28d06872f0..1d1e47d9b6f 100644 --- a/swift/test/Ice/enums/Server.swift +++ b/swift/test/Ice/enums/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/enums/Test.ice b/swift/test/Ice/enums/Test.ice index 6ef00930842..5796e6ee97c 100644 --- a/swift/test/Ice/enums/Test.ice +++ b/swift/test/Ice/enums/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/enums/TestI.swift b/swift/test/Ice/enums/TestI.swift index 9118373eb43..75880630b9d 100644 --- a/swift/test/Ice/enums/TestI.swift +++ b/swift/test/Ice/enums/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice diff --git a/swift/test/Ice/exceptions/AllTests.swift b/swift/test/Ice/exceptions/AllTests.swift index b1a356e4a55..6ebfa0b3e0f 100644 --- a/swift/test/Ice/exceptions/AllTests.swift +++ b/swift/test/Ice/exceptions/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/exceptions/Client.swift b/swift/test/Ice/exceptions/Client.swift index e713adae00f..3c3579650a7 100644 --- a/swift/test/Ice/exceptions/Client.swift +++ b/swift/test/Ice/exceptions/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/exceptions/Collocated.swift b/swift/test/Ice/exceptions/Collocated.swift index 8fb7bd7ebbf..adfa87c4749 100644 --- a/swift/test/Ice/exceptions/Collocated.swift +++ b/swift/test/Ice/exceptions/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/exceptions/Server.swift b/swift/test/Ice/exceptions/Server.swift index e84086a599b..4bd98aae8e1 100644 --- a/swift/test/Ice/exceptions/Server.swift +++ b/swift/test/Ice/exceptions/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/exceptions/ServerAMD.swift b/swift/test/Ice/exceptions/ServerAMD.swift index 97881c4bdb1..0de55ad29b0 100644 --- a/swift/test/Ice/exceptions/ServerAMD.swift +++ b/swift/test/Ice/exceptions/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/exceptions/Test.ice b/swift/test/Ice/exceptions/Test.ice index f579fac3835..171d0aa81b3 100644 --- a/swift/test/Ice/exceptions/Test.ice +++ b/swift/test/Ice/exceptions/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/BuiltinSequences.ice" diff --git a/swift/test/Ice/exceptions/TestAMD.ice b/swift/test/Ice/exceptions/TestAMD.ice index 8f52db92bfb..5604af5ab5e 100644 --- a/swift/test/Ice/exceptions/TestAMD.ice +++ b/swift/test/Ice/exceptions/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/BuiltinSequences.ice" diff --git a/swift/test/Ice/exceptions/TestAMDI.swift b/swift/test/Ice/exceptions/TestAMDI.swift index 0e013abe950..1a2ca89c0d1 100644 --- a/swift/test/Ice/exceptions/TestAMDI.swift +++ b/swift/test/Ice/exceptions/TestAMDI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/exceptions/TestI.swift b/swift/test/Ice/exceptions/TestI.swift index 5b6a15a6408..05ef0c7b18e 100644 --- a/swift/test/Ice/exceptions/TestI.swift +++ b/swift/test/Ice/exceptions/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/facets/AllTests.swift b/swift/test/Ice/facets/AllTests.swift index b76d4693fe2..6e3a668ad90 100644 --- a/swift/test/Ice/facets/AllTests.swift +++ b/swift/test/Ice/facets/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/facets/Client.swift b/swift/test/Ice/facets/Client.swift index 1a84f54f1f5..07f3ed398ee 100644 --- a/swift/test/Ice/facets/Client.swift +++ b/swift/test/Ice/facets/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/facets/Collocated.swift b/swift/test/Ice/facets/Collocated.swift index 96c8a228268..b32e6bc17c8 100644 --- a/swift/test/Ice/facets/Collocated.swift +++ b/swift/test/Ice/facets/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/facets/Server.swift b/swift/test/Ice/facets/Server.swift index 31f3f107e5d..ae1e11dc70d 100644 --- a/swift/test/Ice/facets/Server.swift +++ b/swift/test/Ice/facets/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/facets/Test.ice b/swift/test/Ice/facets/Test.ice index 3c5da35dd6c..17a37e0be2b 100644 --- a/swift/test/Ice/facets/Test.ice +++ b/swift/test/Ice/facets/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/facets/TestI.swift b/swift/test/Ice/facets/TestI.swift index 907db71d082..99d0d8d791b 100644 --- a/swift/test/Ice/facets/TestI.swift +++ b/swift/test/Ice/facets/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice diff --git a/swift/test/Ice/hold/AllTests.swift b/swift/test/Ice/hold/AllTests.swift index 900145d09e2..12dcbc4f6bd 100644 --- a/swift/test/Ice/hold/AllTests.swift +++ b/swift/test/Ice/hold/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/hold/Client.swift b/swift/test/Ice/hold/Client.swift index 8e6547f2d1b..576d5f8d2d0 100644 --- a/swift/test/Ice/hold/Client.swift +++ b/swift/test/Ice/hold/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/hold/Server.swift b/swift/test/Ice/hold/Server.swift index 79db0b5cff4..00c1a606eba 100644 --- a/swift/test/Ice/hold/Server.swift +++ b/swift/test/Ice/hold/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/hold/Test.ice b/swift/test/Ice/hold/Test.ice index 7f097ad5d30..efa14021496 100644 --- a/swift/test/Ice/hold/Test.ice +++ b/swift/test/Ice/hold/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/hold/TestI.swift b/swift/test/Ice/hold/TestI.swift index 996eebc2110..086074bd508 100644 --- a/swift/test/Ice/hold/TestI.swift +++ b/swift/test/Ice/hold/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Foundation diff --git a/swift/test/Ice/info/AllTests.swift b/swift/test/Ice/info/AllTests.swift index 2edc9b6a406..2c107e1270f 100644 --- a/swift/test/Ice/info/AllTests.swift +++ b/swift/test/Ice/info/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/info/Client.swift b/swift/test/Ice/info/Client.swift index 8e6547f2d1b..576d5f8d2d0 100644 --- a/swift/test/Ice/info/Client.swift +++ b/swift/test/Ice/info/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/info/Server.swift b/swift/test/Ice/info/Server.swift index d138ea4e774..558ce391584 100644 --- a/swift/test/Ice/info/Server.swift +++ b/swift/test/Ice/info/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/info/Test.ice b/swift/test/Ice/info/Test.ice index dc50c5a161c..359f401233c 100644 --- a/swift/test/Ice/info/Test.ice +++ b/swift/test/Ice/info/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Context.ice" diff --git a/swift/test/Ice/info/TestI.swift b/swift/test/Ice/info/TestI.swift index 6f0fec5fadb..cbc083b032f 100644 --- a/swift/test/Ice/info/TestI.swift +++ b/swift/test/Ice/info/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice diff --git a/swift/test/Ice/inheritance/AllTests.swift b/swift/test/Ice/inheritance/AllTests.swift index e5c4182039a..255d9687405 100644 --- a/swift/test/Ice/inheritance/AllTests.swift +++ b/swift/test/Ice/inheritance/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/inheritance/Client.swift b/swift/test/Ice/inheritance/Client.swift index d02ff398b9a..411804fecc1 100644 --- a/swift/test/Ice/inheritance/Client.swift +++ b/swift/test/Ice/inheritance/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/inheritance/Collocated.swift b/swift/test/Ice/inheritance/Collocated.swift index 23d9a14340a..5fef4463543 100644 --- a/swift/test/Ice/inheritance/Collocated.swift +++ b/swift/test/Ice/inheritance/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/inheritance/Server.swift b/swift/test/Ice/inheritance/Server.swift index a7fdf7e4e9f..3f6bc77fa29 100644 --- a/swift/test/Ice/inheritance/Server.swift +++ b/swift/test/Ice/inheritance/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/inheritance/Test.ice b/swift/test/Ice/inheritance/Test.ice index 7ab54fe33c8..6d2f9492f4f 100644 --- a/swift/test/Ice/inheritance/Test.ice +++ b/swift/test/Ice/inheritance/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceInheritance"]] diff --git a/swift/test/Ice/inheritance/TestI.swift b/swift/test/Ice/inheritance/TestI.swift index bd124ea5334..d5ca8809a4a 100644 --- a/swift/test/Ice/inheritance/TestI.swift +++ b/swift/test/Ice/inheritance/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/invoke/AllTests.swift b/swift/test/Ice/invoke/AllTests.swift index d8db91ddc6a..cdf90b5903a 100644 --- a/swift/test/Ice/invoke/AllTests.swift +++ b/swift/test/Ice/invoke/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/invoke/Client.swift b/swift/test/Ice/invoke/Client.swift index 93f0ecbf0f8..427fe53ae75 100644 --- a/swift/test/Ice/invoke/Client.swift +++ b/swift/test/Ice/invoke/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/invoke/Server.swift b/swift/test/Ice/invoke/Server.swift index 2cb921853cd..debda47cc3f 100644 --- a/swift/test/Ice/invoke/Server.swift +++ b/swift/test/Ice/invoke/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/invoke/Test.ice b/swift/test/Ice/invoke/Test.ice index 357da20f023..ccff97eda65 100644 --- a/swift/test/Ice/invoke/Test.ice +++ b/swift/test/Ice/invoke/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceInvoke"]] diff --git a/swift/test/Ice/invoke/TestI.swift b/swift/test/Ice/invoke/TestI.swift index 3e792f1321d..f27cebecc20 100644 --- a/swift/test/Ice/invoke/TestI.swift +++ b/swift/test/Ice/invoke/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/location/AllTests.swift b/swift/test/Ice/location/AllTests.swift index 3211a8e149a..6b25cbfe942 100644 --- a/swift/test/Ice/location/AllTests.swift +++ b/swift/test/Ice/location/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/location/Client.swift b/swift/test/Ice/location/Client.swift index 90951358094..9f093c99adb 100644 --- a/swift/test/Ice/location/Client.swift +++ b/swift/test/Ice/location/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/location/Server.swift b/swift/test/Ice/location/Server.swift index 5b8847fcc81..2820c0be622 100644 --- a/swift/test/Ice/location/Server.swift +++ b/swift/test/Ice/location/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Ice diff --git a/swift/test/Ice/location/Test.ice b/swift/test/Ice/location/Test.ice index c767c321181..35e4dda3092 100644 --- a/swift/test/Ice/location/Test.ice +++ b/swift/test/Ice/location/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Locator.ice" diff --git a/swift/test/Ice/location/TestI.swift b/swift/test/Ice/location/TestI.swift index c1f912b12c3..2a0da7c44a5 100644 --- a/swift/test/Ice/location/TestI.swift +++ b/swift/test/Ice/location/TestI.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice import PromiseKit import TestCommon diff --git a/swift/test/Ice/objects/AllTests.swift b/swift/test/Ice/objects/AllTests.swift index ccb1cdcdb63..da6dc21aaae 100644 --- a/swift/test/Ice/objects/AllTests.swift +++ b/swift/test/Ice/objects/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/objects/Client.swift b/swift/test/Ice/objects/Client.swift index c724008cd88..0886920d334 100644 --- a/swift/test/Ice/objects/Client.swift +++ b/swift/test/Ice/objects/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/objects/Collocated.swift b/swift/test/Ice/objects/Collocated.swift index dba4b71d9e8..1a1dadd777f 100644 --- a/swift/test/Ice/objects/Collocated.swift +++ b/swift/test/Ice/objects/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/objects/Derived.ice b/swift/test/Ice/objects/Derived.ice index ae1fa2c1950..c07c3946399 100644 --- a/swift/test/Ice/objects/Derived.ice +++ b/swift/test/Ice/objects/Derived.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Test.ice" diff --git a/swift/test/Ice/objects/DerivedEx.ice b/swift/test/Ice/objects/DerivedEx.ice index bdf0310c9aa..9316a2561f5 100644 --- a/swift/test/Ice/objects/DerivedEx.ice +++ b/swift/test/Ice/objects/DerivedEx.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Test.ice" diff --git a/swift/test/Ice/objects/Forward.ice b/swift/test/Ice/objects/Forward.ice index 5cc93e83b4a..47a8abf93fe 100644 --- a/swift/test/Ice/objects/Forward.ice +++ b/swift/test/Ice/objects/Forward.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/objects/II.swift b/swift/test/Ice/objects/II.swift index 214b3e29d6b..9114cb837d0 100644 --- a/swift/test/Ice/objects/II.swift +++ b/swift/test/Ice/objects/II.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice public class II: Ice.InterfaceByValue { diff --git a/swift/test/Ice/objects/Server.swift b/swift/test/Ice/objects/Server.swift index 9e990b7d5db..dec6d36aaeb 100644 --- a/swift/test/Ice/objects/Server.swift +++ b/swift/test/Ice/objects/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/objects/Test.ice b/swift/test/Ice/objects/Test.ice index 4a88c459d1d..a1095a0d322 100644 --- a/swift/test/Ice/objects/Test.ice +++ b/swift/test/Ice/objects/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceObjects"]] diff --git a/swift/test/Ice/objects/TestI.swift b/swift/test/Ice/objects/TestI.swift index 349703aeee6..8d58f0a0182 100644 --- a/swift/test/Ice/objects/TestI.swift +++ b/swift/test/Ice/objects/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/operations/AllTests.swift b/swift/test/Ice/operations/AllTests.swift index f8db5b63458..b872024937f 100644 --- a/swift/test/Ice/operations/AllTests.swift +++ b/swift/test/Ice/operations/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/BatchOneways.swift b/swift/test/Ice/operations/BatchOneways.swift index b50e2e70eb2..05ac936536f 100644 --- a/swift/test/Ice/operations/BatchOneways.swift +++ b/swift/test/Ice/operations/BatchOneways.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Darwin import Ice diff --git a/swift/test/Ice/operations/BatchOnewaysAMI.swift b/swift/test/Ice/operations/BatchOnewaysAMI.swift index 0bf51da7b0e..88be7b7a7fe 100644 --- a/swift/test/Ice/operations/BatchOnewaysAMI.swift +++ b/swift/test/Ice/operations/BatchOnewaysAMI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Darwin import Ice diff --git a/swift/test/Ice/operations/Client.swift b/swift/test/Ice/operations/Client.swift index 40acd4d752b..2aee7ce0145 100644 --- a/swift/test/Ice/operations/Client.swift +++ b/swift/test/Ice/operations/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/Collocated.swift b/swift/test/Ice/operations/Collocated.swift index c62f3628cb3..b4eb2a478ea 100644 --- a/swift/test/Ice/operations/Collocated.swift +++ b/swift/test/Ice/operations/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/Oneways.swift b/swift/test/Ice/operations/Oneways.swift index 8e47a035ef6..cf474c880c4 100644 --- a/swift/test/Ice/operations/Oneways.swift +++ b/swift/test/Ice/operations/Oneways.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/OnewaysAMI.swift b/swift/test/Ice/operations/OnewaysAMI.swift index cd4d4b380b4..f164fa75187 100644 --- a/swift/test/Ice/operations/OnewaysAMI.swift +++ b/swift/test/Ice/operations/OnewaysAMI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/operations/Server.swift b/swift/test/Ice/operations/Server.swift index 8b5777c8ec6..98e0cd82b35 100644 --- a/swift/test/Ice/operations/Server.swift +++ b/swift/test/Ice/operations/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/ServerAMD.swift b/swift/test/Ice/operations/ServerAMD.swift index 5b62323b49c..2a0decdf522 100644 --- a/swift/test/Ice/operations/ServerAMD.swift +++ b/swift/test/Ice/operations/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/Test.ice b/swift/test/Ice/operations/Test.ice index 6167f1eba03..df734586fd0 100644 --- a/swift/test/Ice/operations/Test.ice +++ b/swift/test/Ice/operations/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Context.ice" diff --git a/swift/test/Ice/operations/TestAMD.ice b/swift/test/Ice/operations/TestAMD.ice index 839c94f286b..3d9e4a86c64 100644 --- a/swift/test/Ice/operations/TestAMD.ice +++ b/swift/test/Ice/operations/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Context.ice" diff --git a/swift/test/Ice/operations/TestAMDI.swift b/swift/test/Ice/operations/TestAMDI.swift index 72b3db11652..1d7e86b5e5c 100644 --- a/swift/test/Ice/operations/TestAMDI.swift +++ b/swift/test/Ice/operations/TestAMDI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/operations/TestI.swift b/swift/test/Ice/operations/TestI.swift index 0e5f396295d..1af742f0fcd 100644 --- a/swift/test/Ice/operations/TestI.swift +++ b/swift/test/Ice/operations/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/operations/Twoways.swift b/swift/test/Ice/operations/Twoways.swift index 7144763897b..dd41f926a03 100644 --- a/swift/test/Ice/operations/Twoways.swift +++ b/swift/test/Ice/operations/Twoways.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/operations/TwowaysAMI.swift b/swift/test/Ice/operations/TwowaysAMI.swift index 76222c51833..d6b019b255b 100644 --- a/swift/test/Ice/operations/TwowaysAMI.swift +++ b/swift/test/Ice/operations/TwowaysAMI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/optional/AllTests.swift b/swift/test/Ice/optional/AllTests.swift index 97995bf16c9..555e4e5ecea 100644 --- a/swift/test/Ice/optional/AllTests.swift +++ b/swift/test/Ice/optional/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/optional/Client.swift b/swift/test/Ice/optional/Client.swift index a06adece62a..93895404ce8 100644 --- a/swift/test/Ice/optional/Client.swift +++ b/swift/test/Ice/optional/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/optional/Server.swift b/swift/test/Ice/optional/Server.swift index 290c7398250..76fa6ba0a6c 100644 --- a/swift/test/Ice/optional/Server.swift +++ b/swift/test/Ice/optional/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/optional/ServerAMD.swift b/swift/test/Ice/optional/ServerAMD.swift index 88088df3c4f..beac36c8038 100644 --- a/swift/test/Ice/optional/ServerAMD.swift +++ b/swift/test/Ice/optional/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice index e3a77895336..28db1bc50a5 100644 --- a/swift/test/Ice/optional/Test.ice +++ b/swift/test/Ice/optional/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceOptional"]] diff --git a/swift/test/Ice/optional/TestAMD.ice b/swift/test/Ice/optional/TestAMD.ice index d82accbee37..13a25795f39 100644 --- a/swift/test/Ice/optional/TestAMD.ice +++ b/swift/test/Ice/optional/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceOptionalAMD"]] diff --git a/swift/test/Ice/optional/TestAMDI.swift b/swift/test/Ice/optional/TestAMDI.swift index 979386820ee..2881ce4afc5 100644 --- a/swift/test/Ice/optional/TestAMDI.swift +++ b/swift/test/Ice/optional/TestAMDI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/optional/TestI.swift b/swift/test/Ice/optional/TestI.swift index af185668b44..e27bbe2f3a5 100644 --- a/swift/test/Ice/optional/TestI.swift +++ b/swift/test/Ice/optional/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/properties/Client.swift b/swift/test/Ice/properties/Client.swift index 7d137725d1f..cd49b1e2c45 100644 --- a/swift/test/Ice/properties/Client.swift +++ b/swift/test/Ice/properties/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/proxy/AllTests.swift b/swift/test/Ice/proxy/AllTests.swift index c8eb8d73b5f..b7509bd3751 100644 --- a/swift/test/Ice/proxy/AllTests.swift +++ b/swift/test/Ice/proxy/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/proxy/Client.swift b/swift/test/Ice/proxy/Client.swift index 1a95808ab6e..7537071e436 100644 --- a/swift/test/Ice/proxy/Client.swift +++ b/swift/test/Ice/proxy/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/proxy/Collocated.swift b/swift/test/Ice/proxy/Collocated.swift index 80c4ff5f907..71c5cf34c75 100644 --- a/swift/test/Ice/proxy/Collocated.swift +++ b/swift/test/Ice/proxy/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/proxy/Server.swift b/swift/test/Ice/proxy/Server.swift index ff7401b2fe5..fde65f7b165 100644 --- a/swift/test/Ice/proxy/Server.swift +++ b/swift/test/Ice/proxy/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/proxy/ServerAMD.swift b/swift/test/Ice/proxy/ServerAMD.swift index e933dcd24ca..e9f112e6a7a 100644 --- a/swift/test/Ice/proxy/ServerAMD.swift +++ b/swift/test/Ice/proxy/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/proxy/Test.ice b/swift/test/Ice/proxy/Test.ice index 0bb5ba3a5c3..19cfa488789 100644 --- a/swift/test/Ice/proxy/Test.ice +++ b/swift/test/Ice/proxy/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Context.ice" diff --git a/swift/test/Ice/proxy/TestAMD.ice b/swift/test/Ice/proxy/TestAMD.ice index 8f747664d94..dfde39eea82 100644 --- a/swift/test/Ice/proxy/TestAMD.ice +++ b/swift/test/Ice/proxy/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Context.ice" diff --git a/swift/test/Ice/proxy/TestAMDI.swift b/swift/test/Ice/proxy/TestAMDI.swift index 93921287417..612ef6cdfba 100644 --- a/swift/test/Ice/proxy/TestAMDI.swift +++ b/swift/test/Ice/proxy/TestAMDI.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice import PromiseKit diff --git a/swift/test/Ice/proxy/TestI.swift b/swift/test/Ice/proxy/TestI.swift index 4201bcdea93..18a4df03373 100644 --- a/swift/test/Ice/proxy/TestI.swift +++ b/swift/test/Ice/proxy/TestI.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice final class MyDerivedClassI: ObjectI, MyDerivedClass { diff --git a/swift/test/Ice/retry/AllTests.swift b/swift/test/Ice/retry/AllTests.swift index 8d70026c29f..f9e7ac3094e 100644 --- a/swift/test/Ice/retry/AllTests.swift +++ b/swift/test/Ice/retry/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/retry/Client.swift b/swift/test/Ice/retry/Client.swift index d46dc9336c0..8d17b029d0b 100644 --- a/swift/test/Ice/retry/Client.swift +++ b/swift/test/Ice/retry/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/retry/Collocated.swift b/swift/test/Ice/retry/Collocated.swift index 83bdf821d0b..d9d11af95af 100644 --- a/swift/test/Ice/retry/Collocated.swift +++ b/swift/test/Ice/retry/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/retry/Server.swift b/swift/test/Ice/retry/Server.swift index 928a4d4329a..20080a9c290 100644 --- a/swift/test/Ice/retry/Server.swift +++ b/swift/test/Ice/retry/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/retry/Test.ice b/swift/test/Ice/retry/Test.ice index 619df58edac..2bedc8d235b 100644 --- a/swift/test/Ice/retry/Test.ice +++ b/swift/test/Ice/retry/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/retry/TestI.swift b/swift/test/Ice/retry/TestI.swift index c5304563621..ee4d493e356 100644 --- a/swift/test/Ice/retry/TestI.swift +++ b/swift/test/Ice/retry/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/scope/AllTests.swift b/swift/test/Ice/scope/AllTests.swift index 60cc1fd36b6..f775e784872 100644 --- a/swift/test/Ice/scope/AllTests.swift +++ b/swift/test/Ice/scope/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/scope/Client.swift b/swift/test/Ice/scope/Client.swift index 82601b8b0a2..7517062dd9a 100644 --- a/swift/test/Ice/scope/Client.swift +++ b/swift/test/Ice/scope/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/scope/Server.swift b/swift/test/Ice/scope/Server.swift index bebf03759bb..4e99b10557c 100644 --- a/swift/test/Ice/scope/Server.swift +++ b/swift/test/Ice/scope/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/scope/Test.ice b/swift/test/Ice/scope/Test.ice index 988e0db999d..f35a55d363a 100644 --- a/swift/test/Ice/scope/Test.ice +++ b/swift/test/Ice/scope/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/scope/TestI.swift b/swift/test/Ice/scope/TestI.swift index 05c7e2d2a24..d35e90129a9 100644 --- a/swift/test/Ice/scope/TestI.swift +++ b/swift/test/Ice/scope/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/servantLocator/AllTests.swift b/swift/test/Ice/servantLocator/AllTests.swift index 1c0ce68ea20..41ebaa0689c 100644 --- a/swift/test/Ice/servantLocator/AllTests.swift +++ b/swift/test/Ice/servantLocator/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/servantLocator/Client.swift b/swift/test/Ice/servantLocator/Client.swift index f0c71b64844..33fc318b8c3 100644 --- a/swift/test/Ice/servantLocator/Client.swift +++ b/swift/test/Ice/servantLocator/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/servantLocator/Collocated.swift b/swift/test/Ice/servantLocator/Collocated.swift index 80318669ecd..af6b3958ed9 100644 --- a/swift/test/Ice/servantLocator/Collocated.swift +++ b/swift/test/Ice/servantLocator/Collocated.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/servantLocator/ServantLocatorI.swift b/swift/test/Ice/servantLocator/ServantLocatorI.swift index e4f572831ca..2bf9e46dd47 100644 --- a/swift/test/Ice/servantLocator/ServantLocatorI.swift +++ b/swift/test/Ice/servantLocator/ServantLocatorI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/servantLocator/Server.swift b/swift/test/Ice/servantLocator/Server.swift index dedcf0c427b..02cbf44266e 100644 --- a/swift/test/Ice/servantLocator/Server.swift +++ b/swift/test/Ice/servantLocator/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/servantLocator/ServerAMD.swift b/swift/test/Ice/servantLocator/ServerAMD.swift index ea228b4b92f..860df137846 100644 --- a/swift/test/Ice/servantLocator/ServerAMD.swift +++ b/swift/test/Ice/servantLocator/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/servantLocator/Test.ice b/swift/test/Ice/servantLocator/Test.ice index 9a65dafe28e..1e74d35ed7f 100644 --- a/swift/test/Ice/servantLocator/Test.ice +++ b/swift/test/Ice/servantLocator/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceServantLocator"]] diff --git a/swift/test/Ice/servantLocator/TestAMD.ice b/swift/test/Ice/servantLocator/TestAMD.ice index 4645f5027ef..8c713c9099a 100644 --- a/swift/test/Ice/servantLocator/TestAMD.ice +++ b/swift/test/Ice/servantLocator/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceServantLocatorAMD"]] diff --git a/swift/test/Ice/servantLocator/TestAMDI.swift b/swift/test/Ice/servantLocator/TestAMDI.swift index e2653b91012..f3bab51cc58 100644 --- a/swift/test/Ice/servantLocator/TestAMDI.swift +++ b/swift/test/Ice/servantLocator/TestAMDI.swift @@ -1,6 +1,5 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + import Ice import PromiseKit import TestCommon diff --git a/swift/test/Ice/servantLocator/TestI.swift b/swift/test/Ice/servantLocator/TestI.swift index 45b3d875129..cbb18b2626f 100644 --- a/swift/test/Ice/servantLocator/TestI.swift +++ b/swift/test/Ice/servantLocator/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/services/Client.swift b/swift/test/Ice/services/Client.swift index 6125f1192f3..e8e110fa775 100644 --- a/swift/test/Ice/services/Client.swift +++ b/swift/test/Ice/services/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Glacier2 import Ice diff --git a/swift/test/Ice/slicing/exceptions/AllTests.swift b/swift/test/Ice/slicing/exceptions/AllTests.swift index a6c283680f4..94067f349a2 100644 --- a/swift/test/Ice/slicing/exceptions/AllTests.swift +++ b/swift/test/Ice/slicing/exceptions/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/slicing/exceptions/Client.swift b/swift/test/Ice/slicing/exceptions/Client.swift index 7ae8becaeeb..be283172bf8 100644 --- a/swift/test/Ice/slicing/exceptions/Client.swift +++ b/swift/test/Ice/slicing/exceptions/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/slicing/exceptions/Server.swift b/swift/test/Ice/slicing/exceptions/Server.swift index 28249dda80c..5651677d826 100644 --- a/swift/test/Ice/slicing/exceptions/Server.swift +++ b/swift/test/Ice/slicing/exceptions/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/slicing/exceptions/ServerAMD.swift b/swift/test/Ice/slicing/exceptions/ServerAMD.swift index a746feb745a..5e22f2f8634 100644 --- a/swift/test/Ice/slicing/exceptions/ServerAMD.swift +++ b/swift/test/Ice/slicing/exceptions/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/slicing/exceptions/ServerPrivate.ice b/swift/test/Ice/slicing/exceptions/ServerPrivate.ice index 43ff134760e..0ea84c6e367 100644 --- a/swift/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/swift/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Test.ice" diff --git a/swift/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/swift/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 7bd87211c68..88294c83784 100644 --- a/swift/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/swift/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "TestAMD.ice" diff --git a/swift/test/Ice/slicing/exceptions/Test.ice b/swift/test/Ice/slicing/exceptions/Test.ice index e466ed04cc0..62248693c22 100644 --- a/swift/test/Ice/slicing/exceptions/Test.ice +++ b/swift/test/Ice/slicing/exceptions/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceSlicingExceptions"]] diff --git a/swift/test/Ice/slicing/exceptions/TestAMD.ice b/swift/test/Ice/slicing/exceptions/TestAMD.ice index f3d957b0695..d2a8f8b0c14 100644 --- a/swift/test/Ice/slicing/exceptions/TestAMD.ice +++ b/swift/test/Ice/slicing/exceptions/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceSlicingExceptionsAMD"]] diff --git a/swift/test/Ice/slicing/exceptions/TestAMDI.swift b/swift/test/Ice/slicing/exceptions/TestAMDI.swift index cbd47f8187e..5c91116fbb5 100644 --- a/swift/test/Ice/slicing/exceptions/TestAMDI.swift +++ b/swift/test/Ice/slicing/exceptions/TestAMDI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/slicing/exceptions/TestI.swift b/swift/test/Ice/slicing/exceptions/TestI.swift index 7cbdd9358f3..9c28ec1e019 100644 --- a/swift/test/Ice/slicing/exceptions/TestI.swift +++ b/swift/test/Ice/slicing/exceptions/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/slicing/objects/AllTests.swift b/swift/test/Ice/slicing/objects/AllTests.swift index 1912a0e7dac..080b56449ef 100644 --- a/swift/test/Ice/slicing/objects/AllTests.swift +++ b/swift/test/Ice/slicing/objects/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Foundation diff --git a/swift/test/Ice/slicing/objects/Client.swift b/swift/test/Ice/slicing/objects/Client.swift index 32ab43b5414..c9395251a83 100644 --- a/swift/test/Ice/slicing/objects/Client.swift +++ b/swift/test/Ice/slicing/objects/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/slicing/objects/ClientPrivate.ice b/swift/test/Ice/slicing/objects/ClientPrivate.ice index ba89a89a65f..8c5593abcf1 100644 --- a/swift/test/Ice/slicing/objects/ClientPrivate.ice +++ b/swift/test/Ice/slicing/objects/ClientPrivate.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Test.ice" diff --git a/swift/test/Ice/slicing/objects/Server.swift b/swift/test/Ice/slicing/objects/Server.swift index 3779b169a35..9deabe84547 100644 --- a/swift/test/Ice/slicing/objects/Server.swift +++ b/swift/test/Ice/slicing/objects/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/slicing/objects/ServerAMD.swift b/swift/test/Ice/slicing/objects/ServerAMD.swift index 3e6432e5745..dfc307e9cf2 100644 --- a/swift/test/Ice/slicing/objects/ServerAMD.swift +++ b/swift/test/Ice/slicing/objects/ServerAMD.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/slicing/objects/ServerPrivate.ice b/swift/test/Ice/slicing/objects/ServerPrivate.ice index bca45d9a758..79cc8e6b800 100644 --- a/swift/test/Ice/slicing/objects/ServerPrivate.ice +++ b/swift/test/Ice/slicing/objects/ServerPrivate.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Test.ice" diff --git a/swift/test/Ice/slicing/objects/ServerPrivateAMD.ice b/swift/test/Ice/slicing/objects/ServerPrivateAMD.ice index dd40f951fe9..93c34d8c806 100644 --- a/swift/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/swift/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "TestAMD.ice" diff --git a/swift/test/Ice/slicing/objects/Test.ice b/swift/test/Ice/slicing/objects/Test.ice index ef32328328d..4d69a05fa02 100644 --- a/swift/test/Ice/slicing/objects/Test.ice +++ b/swift/test/Ice/slicing/objects/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceSlicingObjects"]] diff --git a/swift/test/Ice/slicing/objects/TestAMD.ice b/swift/test/Ice/slicing/objects/TestAMD.ice index 93aa97d8b5c..f3122e9520d 100644 --- a/swift/test/Ice/slicing/objects/TestAMD.ice +++ b/swift/test/Ice/slicing/objects/TestAMD.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once [["swift:class-resolver-prefix:IceSlicingObjectsAMD"]] diff --git a/swift/test/Ice/slicing/objects/TestAMDI.swift b/swift/test/Ice/slicing/objects/TestAMDI.swift index 8ad6bad8664..03eb49e4ec5 100644 --- a/swift/test/Ice/slicing/objects/TestAMDI.swift +++ b/swift/test/Ice/slicing/objects/TestAMDI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/slicing/objects/TestI.swift b/swift/test/Ice/slicing/objects/TestI.swift index 3fee37cd805..16cfb1f2afb 100644 --- a/swift/test/Ice/slicing/objects/TestI.swift +++ b/swift/test/Ice/slicing/objects/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Ice/stream/Client.swift b/swift/test/Ice/stream/Client.swift index 1f89fc432c3..c59d7daf3bb 100644 --- a/swift/test/Ice/stream/Client.swift +++ b/swift/test/Ice/stream/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/stream/Test.ice b/swift/test/Ice/stream/Test.ice index c86033249f5..8deccdef4f5 100644 --- a/swift/test/Ice/stream/Test.ice +++ b/swift/test/Ice/stream/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/BuiltinSequences.ice" diff --git a/swift/test/Ice/timeout/AllTests.swift b/swift/test/Ice/timeout/AllTests.swift index c702b9bcdf3..99289347602 100644 --- a/swift/test/Ice/timeout/AllTests.swift +++ b/swift/test/Ice/timeout/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/Ice/timeout/Client.swift b/swift/test/Ice/timeout/Client.swift index a5a2fa9dd3e..985a1d20609 100644 --- a/swift/test/Ice/timeout/Client.swift +++ b/swift/test/Ice/timeout/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/timeout/Server.swift b/swift/test/Ice/timeout/Server.swift index b6eb24339f6..aaf4d223468 100644 --- a/swift/test/Ice/timeout/Server.swift +++ b/swift/test/Ice/timeout/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/timeout/Test.ice b/swift/test/Ice/timeout/Test.ice index 1e007e5ec91..c51aab5a03c 100644 --- a/swift/test/Ice/timeout/Test.ice +++ b/swift/test/Ice/timeout/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once module Test diff --git a/swift/test/Ice/udp/AllTests.swift b/swift/test/Ice/udp/AllTests.swift index 9ebcd1645bc..3129be95a60 100644 --- a/swift/test/Ice/udp/AllTests.swift +++ b/swift/test/Ice/udp/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Dispatch import Foundation diff --git a/swift/test/Ice/udp/Client.swift b/swift/test/Ice/udp/Client.swift index cbfa8777388..c8e837058ce 100644 --- a/swift/test/Ice/udp/Client.swift +++ b/swift/test/Ice/udp/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/udp/Server.swift b/swift/test/Ice/udp/Server.swift index 2dca9d16d37..42f0d70bbd3 100644 --- a/swift/test/Ice/udp/Server.swift +++ b/swift/test/Ice/udp/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Ice/udp/Test.ice b/swift/test/Ice/udp/Test.ice index d1de35386d9..cd7bf98d0af 100644 --- a/swift/test/Ice/udp/Test.ice +++ b/swift/test/Ice/udp/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once #include "Ice/Identity.ice" diff --git a/swift/test/Ice/udp/TestI.swift b/swift/test/Ice/udp/TestI.swift index b70260bb557..efde2ca8089 100644 --- a/swift/test/Ice/udp/TestI.swift +++ b/swift/test/Ice/udp/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice diff --git a/swift/test/IceSSL/configuration/AllTests.swift b/swift/test/IceSSL/configuration/AllTests.swift index 6422442e865..3b9d9f6cbcd 100644 --- a/swift/test/IceSSL/configuration/AllTests.swift +++ b/swift/test/IceSSL/configuration/AllTests.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/IceSSL/configuration/Client.swift b/swift/test/IceSSL/configuration/Client.swift index 9fe3a37e8f8..0ceca57812c 100644 --- a/swift/test/IceSSL/configuration/Client.swift +++ b/swift/test/IceSSL/configuration/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/IceSSL/configuration/Server.swift b/swift/test/IceSSL/configuration/Server.swift index b51e0da4625..3ae77ff13d1 100644 --- a/swift/test/IceSSL/configuration/Server.swift +++ b/swift/test/IceSSL/configuration/Server.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/IceSSL/configuration/Test.ice b/swift/test/IceSSL/configuration/Test.ice index 4390c390648..f89a3f47a5e 100644 --- a/swift/test/IceSSL/configuration/Test.ice +++ b/swift/test/IceSSL/configuration/Test.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. #pragma once ["swift:module:Test:SSL"] diff --git a/swift/test/IceSSL/configuration/TestI.swift b/swift/test/IceSSL/configuration/TestI.swift index ab50e412696..56fdd2447a3 100644 --- a/swift/test/IceSSL/configuration/TestI.swift +++ b/swift/test/IceSSL/configuration/TestI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import TestCommon diff --git a/swift/test/Slice/escape/Clash.ice b/swift/test/Slice/escape/Clash.ice index f62b94a580e..084260e734e 100644 --- a/swift/test/Slice/escape/Clash.ice +++ b/swift/test/Slice/escape/Clash.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. module Clash { diff --git a/swift/test/Slice/escape/Client.swift b/swift/test/Slice/escape/Client.swift index 660943e5d3b..a3e4272e746 100644 --- a/swift/test/Slice/escape/Client.swift +++ b/swift/test/Slice/escape/Client.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Ice import PromiseKit diff --git a/swift/test/Slice/escape/Key.ice b/swift/test/Slice/escape/Key.ice index db40a526f52..bb5db65fda8 100644 --- a/swift/test/Slice/escape/Key.ice +++ b/swift/test/Slice/escape/Key.ice @@ -1,7 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - +// Copyright (c) ZeroC, Inc. [["suppress-warning:deprecated"]] module and diff --git a/swift/test/TestCommon/TestCommon.swift b/swift/test/TestCommon/TestCommon.swift index 7fa97724565..4427bac0cdc 100644 --- a/swift/test/TestCommon/TestCommon.swift +++ b/swift/test/TestCommon/TestCommon.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/TestDriver/iOS/AppDelegate.swift b/swift/test/TestDriver/iOS/AppDelegate.swift index eac8ac9384b..0e612f94883 100644 --- a/swift/test/TestDriver/iOS/AppDelegate.swift +++ b/swift/test/TestDriver/iOS/AppDelegate.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import UIKit diff --git a/swift/test/TestDriver/iOS/ControllerI.swift b/swift/test/TestDriver/iOS/ControllerI.swift index 43bf1fbe7f5..b582e29dcc8 100644 --- a/swift/test/TestDriver/iOS/ControllerI.swift +++ b/swift/test/TestDriver/iOS/ControllerI.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import Ice diff --git a/swift/test/TestDriver/iOS/ViewController.swift b/swift/test/TestDriver/iOS/ViewController.swift index aeec9e9c2b1..940531bb11b 100644 --- a/swift/test/TestDriver/iOS/ViewController.swift +++ b/swift/test/TestDriver/iOS/ViewController.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Darwin import UIKit diff --git a/swift/test/TestDriver/macOS/main.swift b/swift/test/TestDriver/macOS/main.swift index 5c2083f0a4e..c716f00662e 100644 --- a/swift/test/TestDriver/macOS/main.swift +++ b/swift/test/TestDriver/macOS/main.swift @@ -1,6 +1,4 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. import Foundation import PromiseKit