r223105 - Try to fix the MSVC build.
Hans Wennborg
hans at hanshq.net
Mon Dec 1 18:13:10 PST 2014
Author: hans
Date: Mon Dec 1 20:13:09 2014
New Revision: 223105
URL: http://llvm.org/viewvc/llvm-project?rev=223105&view=rev
Log:
Try to fix the MSVC build.
Modified:
cfe/trunk/lib/Lex/ModuleMap.cpp
cfe/trunk/lib/Serialization/ASTReader.cpp
Modified: cfe/trunk/lib/Lex/ModuleMap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ModuleMap.cpp?rev=223105&r1=223104&r2=223105&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/ModuleMap.cpp (original)
+++ cfe/trunk/lib/Lex/ModuleMap.cpp Mon Dec 1 20:13:09 2014
@@ -1786,23 +1786,23 @@ void ModuleMapParser::parseHeaderDecl(MM
Map.setUmbrellaHeader(ActiveModule, File);
}
} else if (LeadingToken == MMToken::ExcludeKeyword) {
- Map.excludeHeader(ActiveModule,
- Module::Header{RelativePathName.str(), File});
+ Module::Header H = {RelativePathName.str(), File};
+ Map.excludeHeader(ActiveModule, H);
} else {
// If there is a builtin counterpart to this file, add it now, before
// the "real" header, so we build the built-in one first when building
// the module.
- if (BuiltinFile)
+ if (BuiltinFile) {
// FIXME: Taking the name from the FileEntry is unstable and can give
// different results depending on how we've previously named that file
// in this build.
- Map.addHeader(ActiveModule,
- Module::Header{BuiltinFile->getName(), BuiltinFile},
- Role);
+ Module::Header H = { BuiltinFile->getName(), BuiltinFile };
+ Map.addHeader(ActiveModule, H, Role);
+ }
// Record this header.
- Map.addHeader(ActiveModule, Module::Header{RelativePathName.str(), File},
- Role);
+ Module::Header H = { RelativePathName.str(), File };
+ Map.addHeader(ActiveModule, H, Role);
}
} else if (LeadingToken != MMToken::ExcludeKeyword) {
// Ignore excluded header files. They're optional anyway.
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=223105&r1=223104&r2=223105&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Mon Dec 1 20:13:09 2014
@@ -1563,9 +1563,8 @@ HeaderFileInfoTrait::ReadData(internal_k
// information should be propagated through the SUBMODULE_HEADER etc
// records rather than from here.
// FIXME: We don't ever mark excluded headers.
- ModMap.addHeader(
- Mod, Module::Header{key.Filename, FileMgr.getFile(key.Filename)},
- HFI.getHeaderRole());
+ Module::Header H = { key.Filename, FileMgr.getFile(key.Filename) };
+ ModMap.addHeader(Mod, H, HFI.getHeaderRole());
}
}
More information about the cfe-commits
mailing list