summaryrefslogtreecommitdiff
path: root/slice
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-05-29 22:10:59 +0200
committerJose <jose@zeroc.com>2019-05-29 22:10:59 +0200
commited15d60d3ac9fc6cd420443cb1fa18ccb679d713 (patch)
tree88f57c5a520a23d6e8cae8a9ee07393430180afe /slice
parentXcode projet updates (diff)
downloadice-ed15d60d3ac9fc6cd420443cb1fa18ccb679d713.tar.bz2
ice-ed15d60d3ac9fc6cd420443cb1fa18ccb679d713.tar.xz
ice-ed15d60d3ac9fc6cd420443cb1fa18ccb679d713.zip
Rename "swift:adopt" -> "swift:inherits"
Diffstat (limited to 'slice')
-rw-r--r--slice/Ice/Connection.ice2
-rw-r--r--slice/Ice/Endpoint.ice2
2 files changed, 2 insertions, 2 deletions
diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice
index 9c9bde6fafa..76a5ff45229 100644
--- a/slice/Ice/Connection.ice
+++ b/slice/Ice/Connection.ice
@@ -217,7 +217,7 @@ local enum ConnectionClose
* The user-level interface to a connection.
*
**/
-["swift:adopt:Swift.CustomStringConvertible"]
+["swift:inherits:Swift.CustomStringConvertible"]
local interface Connection
{
/**
diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice
index e0c7e898712..e723e416610 100644
--- a/slice/Ice/Endpoint.ice
+++ b/slice/Ice/Endpoint.ice
@@ -157,7 +157,7 @@ local class EndpointInfo
* The user-level interface to an endpoint.
*
**/
-["cpp:comparable", "js:comparable"]
+["cpp:comparable", "js:comparable", "swift:inherits:Swift.CustomStringConvertible"]
local interface Endpoint
{
/**