averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stdlib] Consolidate bridging protocols

Browse Source 
Squash _[Conditionally]BridgedToObjectiveC into one protocol.  This
change results in simpler bridging code with fewer dynamic protocol
conformance checks, and solves the nasty naming/semantics problem that
resulted from having _ConditionallyBridgedToObjectiveC refining
_BridgedToObjectiveC.

Also, rename things so they're more symmetrical and less confusing.

Swift SVN r20664
This commit is contained in:
Dave Abrahams
2014-07-29 01:30:27 +00:00
parent c477314b59
commit 9a13a7148b
33 changed files with 512 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/swift/Serialization/ModuleFormat.h
View File

@@ -1208,8 +1208,7 @@ namespace index_block {
Hashable,
Comparable,
_BridgedToObjectiveCType,
_ConditionallyBridgedToObjectiveCType,
_ObjectiveCBridgeable
};
using KnownProtocolLayout = BCGenericRecordLayout<