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: remove Word and UWord

Browse Source 
These types are leftovers from the early pre-1.0 times when Int and UInt
were always 64-bit on all platforms.  They serve no useful purpose
today.  Int and UInt are defined to be word-sized and should be used
instead.

rdar://18693488

Swift SVN r30564
This commit is contained in:
Dmitri Hrybenko
2015-07-24 05:01:32 +00:00
parent ef553f47cf
commit f5de8757e4
58 changed files with 1073 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
validation-test/stdlib/ArrayBridging.swift
View File

@@ -23,7 +23,7 @@ struct ArrayBridge_objectAtIndex_RaceTest : RaceTestWithPerTrialDataType {
}
typealias ThreadLocalData = Void
typealias Observation = Observation1UWord
typealias Observation = Observation1UInt
func makeRaceData() -> RaceData {
let nsa = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 1)
@@ -39,7 +39,7 @@ struct ArrayBridge_objectAtIndex_RaceTest : RaceTestWithPerTrialDataType {
) -> Observation {
let nsa = raceData.nsa
let v: AnyObject = nsa.objectAtIndex(0)
return Observation(unsafeBitCast(v, UWord.self))
return Observation(unsafeBitCast(v, UInt.self))
}
func evaluateObservations(observations: [Observation],
@@ -58,7 +58,7 @@ struct ArrayBridge_FastEnumeration_ObjC_RaceTest :
}
typealias ThreadLocalData = Void
typealias Observation = Observation4UWord
typealias Observation = Observation4UInt
func makeRaceData() -> RaceData {
let nsa = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 4)
@@ -76,10 +76,10 @@ struct ArrayBridge_FastEnumeration_ObjC_RaceTest :
let objcValues = NSMutableArray()
slurpFastEnumerationOfArrayFromObjCImpl(nsa, nsa, objcValues)
return Observation(
unsafeBitCast(objcValues[0], UWord.self),
unsafeBitCast(objcValues[1], UWord.self),
unsafeBitCast(objcValues[2], UWord.self),
unsafeBitCast(objcValues[3], UWord.self))
unsafeBitCast(objcValues[0], UInt.self),
unsafeBitCast(objcValues[1], UInt.self),
unsafeBitCast(objcValues[2], UInt.self),
unsafeBitCast(objcValues[3], UInt.self))
}
func evaluateObservations(observations: [Observation],