Skip to content

Commit 74d214d

Browse files
committed
---
yaml --- r: 345311 b: refs/heads/master c: c603dae h: refs/heads/master i: 345309: 39480eb 345307: 3b13538 345303: e441992 345295: e292710 345279: 959748e
1 parent 705c67a commit 74d214d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
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: 6717dd7552035c224cc1f9ee21f833a105611e52
2+
refs/heads/master: c603dae4ae9f88007fc4bb56faeca963566f6472
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/SDK/Foundation/Measurement.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,15 @@ extension Measurement {
206206

207207
// Implementation note: similar to NSArray, NSDictionary, etc., NSMeasurement's import as an ObjC generic type is suppressed by the importer. Eventually we will need a more general purpose mechanism to correctly import generic types.
208208

209+
// FIXME: Remove @usableFromInline from MeasurementBridgeType once
210+
// rdar://problem/44662501 is fixed. (The Radar basically just says "look
211+
// through typealiases and inherited protocols when printing extensions".)
212+
209213
#if DEPLOYMENT_RUNTIME_SWIFT
214+
@usableFromInline
210215
internal typealias MeasurementBridgeType = _ObjectTypeBridgeable
211216
#else
217+
@usableFromInline
212218
internal typealias MeasurementBridgeType = _ObjectiveCBridgeable
213219
#endif
214220

0 commit comments

Comments
 (0)