diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-11-30 23:21:26 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-11-30 23:21:26 +0000 |
| commit | de3ef502a97c428236427d6583384bb7c85a81fc (patch) | |
| tree | 47c6097eb0dc70231eb8afde1005132aea7cf5a5 /clang/lib/Frontend/FrontendActions.cpp | |
| parent | 60e2c6aa433e6cbb3eb13377c9e8904209416267 (diff) | |
| download | llvm-de3ef502a97c428236427d6583384bb7c85a81fc.zip llvm-de3ef502a97c428236427d6583384bb7c85a81fc.tar.gz llvm-de3ef502a97c428236427d6583384bb7c85a81fc.tar.bz2 | |
Promote ModuleMap::Module to a namespace-scope class in the Basic
library, since modules cut across all of the libraries. Rename
serialization::Module to serialization::ModuleFile to side-step the
annoying naming conflict. Prune a bunch of ModuleMap.h includes that
are no longer needed (most files only needed the Module type).
llvm-svn: 145538
Diffstat (limited to 'clang/lib/Frontend/FrontendActions.cpp')
| -rw-r--r-- | clang/lib/Frontend/FrontendActions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index 0cbcde5..5c4e447 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -131,7 +131,7 @@ ASTConsumer *GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI, /// \param Module The module we're collecting includes from. /// \param ExplicitOnly Whether we should only add headers from explicit static void collectModuleHeaderIncludes(const LangOptions &LangOpts, - ModuleMap::Module *Module, + clang::Module *Module, bool ExplicitOnly, llvm::SmallString<256> &Includes) { if (!ExplicitOnly || Module->IsExplicit) { @@ -147,7 +147,7 @@ static void collectModuleHeaderIncludes(const LangOptions &LangOpts, } // Recurse into submodules. - for (llvm::StringMap<ModuleMap::Module *>::iterator + for (llvm::StringMap<clang::Module *>::iterator Sub = Module->SubModules.begin(), SubEnd = Module->SubModules.end(); Sub != SubEnd; ++Sub) { |