Skip to content

Commit 0224212

Browse files
authored
---
yaml --- r: 303103 b: refs/heads/tensorflow c: 80aad10 h: refs/heads/master i: 303101: b5cef81 303099: a356ea9 303095: 8bcd697 303087: 5d281ce 303071: 1aad3b3 303039: fa17b2e 302975: 9b2cd1b 302847: 4e88019 302591: 58da22a 302079: 6ad535c 301055: db4150b 299007: a907ca3 294911: 1f1cc10
1 parent b5dc031 commit 0224212

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
816816
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
817817
refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
818818
"refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
819-
refs/heads/tensorflow: a123d6321a65d66dceb7dfb5488e1c0f7189a591
819+
refs/heads/tensorflow: 80aad109a32b02e403d1a550487228f13d4b55db
820820
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
821821
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
822822
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/stdlib/public/Darwin/Foundation/NSValue.swift.gyb

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

2626
extension NSValue {
27+
@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
2728
public func value<StoredType>(of type: StoredType.Type) -> StoredType? {
2829
if StoredType.self is AnyObject.Type {
2930
let encoding = String(cString: objCType)
@@ -42,12 +43,12 @@ extension NSValue {
4243
let allocated = UnsafeMutablePointer<StoredType>.allocate(capacity: 1)
4344
defer { allocated.deallocate() }
4445
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-
}
46+
getValue(allocated, size: storedSize)
47+
} else {
48+
getValue(allocated)
49+
}
4950
return allocated.pointee
5051
}
5152
return nil
5253
}
53-
}
54+
}

branches/tensorflow/test/stdlib/NSValueBridging.swift.gyb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ 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+
9597
let range = NSRange(location: 17, length: 38)
9698
let value = NSValue(range: range)
9799
expectEqual(value.value(of: NSRange.self)?.location, range.location)

0 commit comments

Comments
 (0)