From de3ef502a97c428236427d6583384bb7c85a81fc Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 30 Nov 2011 23:21:26 +0000 Subject: 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 --- clang/lib/Serialization/Module.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'clang/lib/Serialization/Module.cpp') diff --git a/clang/lib/Serialization/Module.cpp b/clang/lib/Serialization/Module.cpp index fd18fb7..241b6ba 100644 --- a/clang/lib/Serialization/Module.cpp +++ b/clang/lib/Serialization/Module.cpp @@ -20,7 +20,7 @@ using namespace clang; using namespace serialization; using namespace reader; -Module::Module(ModuleKind Kind) +ModuleFile::ModuleFile(ModuleKind Kind) : Kind(Kind), DirectlyImported(false), SizeInBits(0), LocalNumSLocEntries(0), SLocEntryBaseID(0), SLocEntryBaseOffset(0), SLocEntryOffsets(0), @@ -39,7 +39,7 @@ Module::Module(ModuleKind Kind) LocalNumTypes(0), TypeOffsets(0), BaseTypeIndex(0), StatCache(0) {} -Module::~Module() { +ModuleFile::~ModuleFile() { for (DeclContextInfosMap::iterator I = DeclContextInfos.begin(), E = DeclContextInfos.end(); I != E; ++I) { @@ -68,7 +68,7 @@ dumpLocalRemap(StringRef Name, } } -void Module::dump() { +void ModuleFile::dump() { llvm::errs() << "\nModule: " << FileName << "\n"; if (!Imports.empty()) { llvm::errs() << " Imports: "; -- cgit v1.1