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

6
stdlib/public/core/Arrays.swift.gyb
View File

@@ -1486,13 +1486,13 @@ extension ${Self} : CustomStringConvertible, CustomDebugStringConvertible {
extension ${Self} {
@_versioned
@_transparent
internal func _cPointerArgs() -> (AnyObject?, UnsafeRawPointer?) {
internal func _cPointerArgs() -> (AnyObject?, UnsafePointer<Void>?) {
let p = _baseAddressIfContiguous
if _fastPath(p != nil || isEmpty) {
return (_owner, UnsafeRawPointer(p))
return (_owner, UnsafePointer(p))
}
let n = ContiguousArray(self._buffer)._buffer
return (n.owner, UnsafeRawPointer(n.firstElementAddress))
return (n.owner, UnsafePointer(n.firstElementAddress))
}
}