Rename "swift:adopt" -> "swift:inherits"

4 files changed, 16 insertions, 17 deletions

diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp
index fa4ea793c80..77960e9dba2 100644
--- a/cpp/src/slice2swift/Gen.cpp
+++ b/cpp/src/slice2swift/Gen.cpp
@@ -1534,15 +1534,15 @@ Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     }
 
     //
-    // Check for swift:adopt metadata.
+    // Check for swift:inherit metadata.
     //
     const StringList metaData = p->getMetaData();
-    static const string adoptPrefix = "swift:adopt:";
+    static const string prefix = "swift:inherits:";
     for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); ++q)
     {
-        if(q->find(adoptPrefix) == 0)
+        if(q->find(prefix) == 0)
         {
-            baseNames.push_back(q->substr(adoptPrefix.size()));
+            baseNames.push_back(q->substr(prefix.size()));
         }
     }
 
@@ -1881,15 +1881,15 @@ Gen::LocalObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     }
 
     //
-    // Check for swift:adopt metadata.
+    // Check for swift:inherits metadata.
     //
     const StringList metaData = p->getMetaData();
-    static const string adoptPrefix = "swift:adopt:";
+    static const string prefix = "swift:inherits:";
     for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); ++q)
     {
-        if(q->find(adoptPrefix) == 0)
+        if(q->find(prefix) == 0)
         {
-            baseNames.push_back(q->substr(adoptPrefix.size()));
+            baseNames.push_back(q->substr(prefix.size()));
         }
     }
 
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
 {
     /**
diff --git a/swift/src/Ice/EndpointI.swift b/swift/src/Ice/EndpointI.swift
index 8b26730d168..e07055604d7 100644
--- a/swift/src/Ice/EndpointI.swift
+++ b/swift/src/Ice/EndpointI.swift
@@ -4,7 +4,7 @@
 
 import IceObjc
 
-class EndpointI: LocalObject<ICEEndpoint>, Endpoint, CustomStringConvertible {
+class EndpointI: LocalObject<ICEEndpoint>, Endpoint {
     func toString() -> String {
         return handle.toString()
     }
@@ -12,6 +12,11 @@ class EndpointI: LocalObject<ICEEndpoint>, Endpoint, CustomStringConvertible {
     func getInfo() -> EndpointInfo? {
         return handle.getInfo() as? EndpointInfo
     }
+
+    // CustomStringConvertible implementation
+    var description: String {
+        return toString()
+    }
 }
 
 public func != (lhs: Endpoint?, rhs: Endpoint?) -> Bool {
@@ -32,12 +37,6 @@ public func == (lhs: Endpoint?, rhs: Endpoint?) -> Bool {
     }
 }
 
-extension Endpoint where Self: CustomStringConvertible {
-    var description: String {
-        return toString()
-    }
-}
-
 class EndpointInfoI: LocalObject<ICEEndpointInfo>, EndpointInfo {
     var underlying: EndpointInfo?
     var timeout: Int32