Skip to content

Commit 8175f4b

Browse files
committed
---
yaml --- r: 347815 b: refs/heads/master c: c4665d0 h: refs/heads/master i: 347813: 519cfd2 347811: efaca85 347807: a1394ba
1 parent c5e0033 commit 8175f4b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 901ede5bcb8b0eb85e7f85c3361ec89093a80933
2+
refs/heads/master: c4665d0b5035de591f9a6245da19b6dc2dbdbbe9
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/Darwin/Foundation/NSValue.swift.gyb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ ${ ObjectiveCBridgeableImplementationForNSValue("CGSize") }
2424
${ ObjectiveCBridgeableImplementationForNSValue("CGAffineTransform") }
2525

2626
extension NSValue {
27-
@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
2827
public func value<StoredType>(of type: StoredType.Type) -> StoredType? {
2928
if StoredType.self is AnyObject.Type {
3029
let encoding = String(cString: objCType)
@@ -42,9 +41,13 @@ extension NSValue {
4241
}
4342
let allocated = UnsafeMutablePointer<StoredType>.allocate(capacity: 1)
4443
defer { allocated.deallocate() }
45-
getValue(allocated, size: storedSize)
44+
if #available(OSX 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
45+
getValue(allocated, size: storedSize)
46+
} else {
47+
getValue(allocated)
48+
}
4649
return allocated.pointee
4750
}
4851
return nil
4952
}
50-
}
53+
}

trunk/test/stdlib/NSValueBridging.swift.gyb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ nsValueBridging.test("NSValue can only be cast back to its original type") {
9292
}
9393

9494
nsValueBridging.test("NSValue fetching method should be able to convert constructed values safely") {
95-
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
96-
9795
let range = NSRange(location: 17, length: 38)
9896
let value = NSValue(range: range)
9997
expectEqual(value.value(of: NSRange.self)?.location, range.location)

0 commit comments

Comments
 (0)