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

Track uptstream LLVM API change: llvm::tie() was removed, use std::tie() instead

Browse Source 
Swift SVN r14573
This commit is contained in:
Dmitri Hrybenko
2014-03-02 13:53:19 +00:00
parent be7759b149
commit ba6548b072
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFile.cpp
View File

@@ -142,7 +142,7 @@ SerializedModuleLoader::validateSerializedAST(StringRef data) {
while (topLevelEntry.Kind == llvm::BitstreamEntry::SubBlock) {
if (topLevelEntry.ID == CONTROL_BLOCK_ID) {
cursor.EnterSubBlock(CONTROL_BLOCK_ID);
llvm::tie(result.status, result.name) =
std::tie(result.status, result.name) =
validateControlBlock(cursor, scratch);
if (result.status == ModuleStatus::Malformed)
return result;
@@ -587,7 +587,7 @@ bool ModuleFile::associateWithFileContext(FileUnit *file) {
assert(!dependency.isLoaded() && "already loaded?");
StringRef modulePath, scopePath;
llvm::tie(modulePath, scopePath) = dependency.RawAccessPath.split('\0');
std::tie(modulePath, scopePath) = dependency.RawAccessPath.split('\0');
auto moduleID = ctx.getIdentifier(modulePath);
assert(!moduleID.empty() &&
@@ -693,7 +693,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
ASTContext &Ctx = getContext();
for (auto &Dep : Dependencies) {
StringRef ModulePath, ScopePath;
llvm::tie(ModulePath, ScopePath) = Dep.RawAccessPath.split('\0');
std::tie(ModulePath, ScopePath) = Dep.RawAccessPath.split('\0');
auto ModuleID = Ctx.getIdentifier(ModulePath);
assert(!ModuleID.empty() &&