aboutsummaryrefslogtreecommitdiff
path: root/lib/Lex/Preprocessor.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-11-30 00:36:36 +0000
committerDouglas Gregor <dgregor@apple.com>2011-11-30 00:36:36 +0000
commit3d3589db579f7695667b913c5043dd264ebe546f (patch)
tree6b0b95eaeefc38ddb85a1086076867f91e2e1b7f /lib/Lex/Preprocessor.cpp
parentd5a3b7804f1594c9f21c7f2cee0920a66feeb93a (diff)
Switch the module-loading interfaces and parser from a simple
top-level module name to a module path (e.g., std.vector). We're still missing a number of pieces for this actually to do something. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145462 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/Preprocessor.cpp')
-rw-r--r--lib/Lex/Preprocessor.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 798244c3d2..aeba32f96a 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -575,9 +575,11 @@ void Preprocessor::LexAfterModuleImport(Token &Result) {
return;
// Load the module.
- (void)TheModuleLoader.loadModule(ModuleImportLoc,
- *Result.getIdentifierInfo(),
- Result.getLocation());
+ llvm::SmallVector<std::pair<IdentifierInfo *, SourceLocation>, 2> Path;
+ Path.push_back(std::make_pair(Result.getIdentifierInfo(),
+ Result.getLocation()));
+
+ (void)TheModuleLoader.loadModule(ModuleImportLoc, Path);
}
void Preprocessor::AddCommentHandler(CommentHandler *Handler) {