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 | 1a4761edca58c6b559de825b9abfb66f7f1ba94a (patch) | |
| tree | bd17d1a3341870f9378db26a09045b3bb2db8426 /lib/Frontend/FrontendActions.cpp | |
| parent | 8d39c3ddfc17d9e768a17eb0ce9f11c33bf9d50a (diff) | |
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).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145538 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/FrontendActions.cpp')
| -rw-r--r-- | lib/Frontend/FrontendActions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 0cbcde5bda..5c4e447ef5 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/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) { |