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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-04-05 22:53:22 -07:00
parent b9b0db1f42 431dd1c6df
commit 2fda5ce1f5
21 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -4386,8 +4386,8 @@ public:
} // end unnamed namespace
typedef llvm::StringMap<std::string> FileNameToGroupNameMap;
typedef std::unique_ptr<FileNameToGroupNameMap> pFileNameToGroupNameMap;
using FileNameToGroupNameMap = llvm::StringMap<std::string>;
using pFileNameToGroupNameMap = std::unique_ptr<FileNameToGroupNameMap>;
class YamlGroupInputParser {
StringRef RecordPath;