diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2022-12-20 00:15:11 +0100 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2022-12-20 00:41:40 +0100 |
commit | 854c10f8d185286d941307e1033eb492e085c203 (patch) | |
tree | d80b1b5ae1be07e2cbd1315f64e6ab2d36773847 /clang/lib/Frontend/ModuleDependencyCollector.cpp | |
parent | eddb7280462ca316ba8d4d9fa6f175e8e2e65b72 (diff) | |
download | llvm-854c10f8d185286d941307e1033eb492e085c203.zip llvm-854c10f8d185286d941307e1033eb492e085c203.tar.gz llvm-854c10f8d185286d941307e1033eb492e085c203.tar.bz2 |
[Clang] Prepare for llvm::Optional becoming std::optional.
The needed tweaks are mostly trivial, the one nasty bit is Clang's usage
of OptionalStorage. To keep this working old Optional stays around as
clang::CustomizableOptional, with the default Storage removed.
Optional<File/DirectoryEntryRef> is replaced with a typedef.
I tested this with GCC 7.5, the oldest supported GCC I had around.
Differential Revision: https://reviews.llvm.org/D140332
Diffstat (limited to 'clang/lib/Frontend/ModuleDependencyCollector.cpp')
-rw-r--r-- | clang/lib/Frontend/ModuleDependencyCollector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Frontend/ModuleDependencyCollector.cpp b/clang/lib/Frontend/ModuleDependencyCollector.cpp index 7e19ed3..99a2875d 100644 --- a/clang/lib/Frontend/ModuleDependencyCollector.cpp +++ b/clang/lib/Frontend/ModuleDependencyCollector.cpp @@ -48,7 +48,7 @@ struct ModuleDependencyPPCallbacks : public PPCallbacks { void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, - Optional<FileEntryRef> File, StringRef SearchPath, + OptionalFileEntryRef File, StringRef SearchPath, StringRef RelativePath, const Module *Imported, SrcMgr::CharacteristicKind FileType) override { if (!File) |