Skip to content

Commit 25fc3ed

Browse files
authored
Merge pull request swiftlang#10515 from itaiferber/nskeyedarchiver-data-overloads
Change NSKeyedUnarchiver method instead of adding overloads
2 parents 98a4f94 + a5df6fa commit 25fc3ed

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

stdlib/public/SDK/Foundation/NSCoder.swift

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,29 +144,15 @@ extension NSKeyedUnarchiver {
144144
return result as AnyObject?
145145
}
146146

147-
@nonobjc
148-
@available(swift, obsoleted: 4)
149-
@available(OSX 10.11, iOS 9.0, *)
150-
public class func unarchiveTopLevelObjectWithData(_ data: Data) throws -> AnyObject? {
151-
return try self.unarchiveTopLevelObjectWithData(data as NSData)
152-
}
153-
154147
@nonobjc
155148
@available(swift, introduced: 4)
156149
@available(OSX 10.11, iOS 9.0, *)
157-
public class func unarchiveTopLevelObjectWithData(_ data: NSData) throws -> Any? {
150+
public class func unarchiveTopLevelObjectWithData(_ data: Data) throws -> Any? {
158151
var error: NSError?
159-
let result = __NSKeyedUnarchiverUnarchiveObject(self, data, &error)
152+
let result = __NSKeyedUnarchiverUnarchiveObject(self, data as NSData, &error)
160153
try resolveError(error)
161154
return result
162155
}
163-
164-
@nonobjc
165-
@available(swift, introduced: 4)
166-
@available(OSX 10.11, iOS 9.0, *)
167-
public class func unarchiveTopLevelObjectWithData(_ data: Data) throws -> Any? {
168-
return try self.unarchiveTopLevelObjectWithData(data as NSData)
169-
}
170156
}
171157

172158

0 commit comments

Comments
 (0)