diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-12-08 17:39:04 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-12-08 17:39:04 +0000 |
| commit | 73141fa98d34ccd5cd420301122df4e214d9238a (patch) | |
| tree | 735c613820ce3692df6c8c2580ce7f04b179b7fd /clang/lib/Serialization/ASTReader.cpp | |
| parent | c09e4593b2ab7aadf07aef1c6b2be7f6d6e13061 (diff) | |
| download | bcm5719-llvm-73141fa98d34ccd5cd420301122df4e214d9238a.tar.gz bcm5719-llvm-73141fa98d34ccd5cd420301122df4e214d9238a.zip | |
Within the module representation, generalize the notion of an umbrella
header to also support umbrella directories. The umbrella directory
for an umbrella header is the directory in which the umbrella header
resides.
No functionality change yet, but it's coming.
llvm-svn: 146158
Diffstat (limited to 'clang/lib/Serialization/ASTReader.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 76ba9e2b263..21be3aa50c7 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -3099,9 +3099,9 @@ ASTReader::ASTReadResult ASTReader::ReadSubmoduleBlock(ModuleFile &F) { StringRef FileName(BlobStart, BlobLen); if (const FileEntry *Umbrella = PP.getFileManager().getFile(FileName)) { - if (!CurrentModule->UmbrellaHeader) + if (!CurrentModule->getUmbrellaHeader()) ModMap.setUmbrellaHeader(CurrentModule, Umbrella); - else if (CurrentModule->UmbrellaHeader != Umbrella) { + else if (CurrentModule->getUmbrellaHeader() != Umbrella) { Error("mismatched umbrella headers in submodule"); return Failure; } |
