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

Merge branch 'master' into normal-conformance-requirement-signature

Browse Source
This commit is contained in:
Doug Gregor
2017-03-01 20:38:20 -08:00
committed by GitHub
parent 348c6b8001 2561eddab0
commit ce718eeb54
74 changed files with 1291 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ const uint16_t VERSION_MAJOR = 0;
/// in source control, you should also update the comment to briefly
/// describe what change you made. The content of this comment isn't important;
/// it just ensures a conflict if two people change the module format.
const uint16_t VERSION_MINOR = 322; // Last change: requirement conformances
const uint16_t VERSION_MINOR = 323; // Last change: requirement conformances
using DeclID = PointerEmbeddedInt<unsigned, 31>;
using DeclIDField = BCFixed<31>;