Skip to content

Commit b5dc031

Browse files
committed
---
yaml --- r: 303102 b: refs/heads/tensorflow c: a123d63 h: refs/heads/master
1 parent b5cef81 commit b5dc031

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
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: fb55fc3be8dfb9141f19efa7f2d964a1b726ab16
819+
refs/heads/tensorflow: a123d6321a65d66dceb7dfb5488e1c0f7189a591
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: 5 additions & 6 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)
@@ -43,12 +42,12 @@ extension NSValue {
4342
let allocated = UnsafeMutablePointer<StoredType>.allocate(capacity: 1)
4443
defer { allocated.deallocate() }
4544
if #available(OSX 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
46-
getValue(allocated, size: storedSize)
47-
} else {
48-
getValue(allocated)
49-
}
45+
getValue(allocated, size: storedSize)
46+
} else {
47+
getValue(allocated)
48+
}
5049
return allocated.pointee
5150
}
5251
return nil
5352
}
54-
}
53+
}

branches/tensorflow/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)

branches/tensorflow/utils/swift_build_support/tests/test_host_specific_configuration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,8 @@ def test_should_test_optimizations_with_subsets(self):
596596
before.swift_test_run_targets)
597597
self.assertIn(target_name.format('optimize_size'),
598598
before.swift_test_run_targets)
599-
self.assertIn(target_name.format('optimize_none_with_implicit_dynamic'),
599+
self.assertIn(target_name.format(
600+
'optimize_none_with_implicit_dynamic'),
600601
before.swift_test_run_targets)
601602

602603
def default_args(self):

0 commit comments

Comments
 (0)