Merge commit '9cdbec13eee72feccfc5f8b987882a8c52e8107b' into swift-3-indexing-model

This commit is contained in:
Dmitri Gribenko
2016-04-14 16:23:53 -07:00
185 changed files with 2794 additions and 1833 deletions

View File

@@ -33,7 +33,7 @@ class NonContiguousNSString : NSString {
super.init()
}
@objc(copyWithZone:) override func copy(with zone: NSZone) -> AnyObject {
@objc(copyWithZone:) override func copy(with zone: NSZone?) -> AnyObject {
// Ensure that copying this string produces a class that CoreFoundation
// does not know about.
return self