Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

This commit is contained in:
Dmitri Gribenko
2016-02-17 14:40:05 -08:00
450 changed files with 8406 additions and 5202 deletions

View File

@@ -110,7 +110,8 @@ extension _SwiftNativeNSArrayWithContiguousStorage: _NSArrayCore {
}
}
@objc internal func copy(withZone _: _SwiftNSZone) -> AnyObject {
@objc(copyWithZone:)
internal func copy(withZone _: _SwiftNSZone) -> AnyObject {
return self
}
}