averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Migrate from UnsafePointer<Void> to UnsafeRawPointer. (#3724)"

Browse Source 
This reverts commit ece0951924.

This results in lldb failues on linux that I can't readily debug.
Backing out until they can be resolved.
This commit is contained in:
Andrew Trick
2016-07-26 02:50:57 -07:00
parent b65244805a
commit 0ed9ee8dee
74 changed files with 307 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdlib/public/SDK/Foundation/NSError.swift
View File

@@ -41,7 +41,7 @@ internal func NS_Swift_performErrorRecoverySelector(
delegate: AnyObject?,
selector: Selector,
success: ObjCBool,
contextInfo: UnsafeMutableRawPointer?)
contextInfo: UnsafeMutablePointer<Void>?)
/// Class that implements the informal protocol
/// NSErrorRecoveryAttempting, which is used by NSError when it
@@ -52,7 +52,7 @@ class _NSErrorRecoveryAttempter {
optionIndex recoveryOptionIndex: Int,
delegate: AnyObject?,
didRecoverSelector: Selector,
contextInfo: UnsafeMutableRawPointer?) {
contextInfo: UnsafeMutablePointer<Void>?) {
let error = nsError as Error as! RecoverableError
error.attemptRecovery(optionIndex: recoveryOptionIndex) { success in
NS_Swift_performErrorRecoverySelector(