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

[stdlib] Add "Mutable" to [Autoreleasing]UnsafePointer

Browse Source 
UnsafePointer becomes UnsafeMutablePointer
AutoreleasingUnsafePointer becomes AutoreleasingUnsafeMutablePointer

Swift SVN r20316
This commit is contained in:
Dave Abrahams
2014-07-22 16:56:23 +00:00
parent 6867ce2e2c
commit 21669b3aee
107 changed files with 717 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/core/CocoaArray.swift
View File

@@ -30,11 +30,11 @@ import SwiftShims
public protocol _CocoaArrayType {
func objectAtIndex(index: Int) -> AnyObject
func getObjects(UnsafePointer<AnyObject>, range: _SwiftNSRange)
func getObjects(UnsafeMutablePointer<AnyObject>, range: _SwiftNSRange)
func countByEnumeratingWithState(
state: UnsafePointer<_SwiftNSFastEnumerationState>,
objects buffer: UnsafePointer<AnyObject>,
state: UnsafeMutablePointer<_SwiftNSFastEnumerationState>,
objects buffer: UnsafeMutablePointer<AnyObject>,
count len: Int) -> Int
func copyWithZone(COpaquePointer) -> _CocoaArrayType
@@ -69,7 +69,9 @@ internal struct _CocoaArrayWrapper : CollectionType {
/// is sometimes conservative and may return nil even when
/// contiguous storage exists, e.g., if array doesn't have a smart
/// implementation of countByEnumeratingWithState.
func contiguousStorage(subRange: Range<Int>) -> UnsafePointer<AnyObject>
func contiguousStorage(
subRange: Range<Int>
) -> UnsafeMutablePointer<AnyObject>
{
var enumerationState = _makeSwiftNSFastEnumerationState()
@@ -77,7 +79,7 @@ internal struct _CocoaArrayWrapper : CollectionType {
// subRange.endIndex items are stored contiguously. This is an
// acceptable conservative behavior, but could potentially be
// optimized for other cases.
let contiguousCount = withUnsafePointer(&enumerationState) {
let contiguousCount = withUnsafeMutablePointer(&enumerationState) {
self.buffer.countByEnumeratingWithState($0, objects: nil, count: 0)
}