diff options
| author | Kazu Hirata <kazu@google.com> | 2023-01-14 12:31:01 -0800 |
|---|---|---|
| committer | Kazu Hirata <kazu@google.com> | 2023-01-14 12:31:01 -0800 |
| commit | 6ad0788c332bb2043142954d300c49ac3e537f34 (patch) | |
| tree | a67542ce4ca8dbcc65ef3cd01e76ff9cb861208b /clang/lib/Lex/ModuleMap.cpp | |
| parent | ff39b7ea89476c78177aff5cb0ddb441e74c8838 (diff) | |
| download | llvm-6ad0788c332bb2043142954d300c49ac3e537f34.zip llvm-6ad0788c332bb2043142954d300c49ac3e537f34.tar.gz llvm-6ad0788c332bb2043142954d300c49ac3e537f34.tar.bz2 | |
[clang] Use std::optional instead of llvm::Optional (NFC)
This patch replaces (llvm::|)Optional< with std::optional<. I'll post
a separate patch to remove #include "llvm/ADT/Optional.h".
This is part of an effort to migrate from llvm::Optional to
std::optional:
https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 7292f16..106e9c3 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -1213,7 +1213,7 @@ void ModuleMap::resolveHeaderDirectives(const FileEntry *File) const { } void ModuleMap::resolveHeaderDirectives( - Module *Mod, llvm::Optional<const FileEntry *> File) const { + Module *Mod, std::optional<const FileEntry *> File) const { bool NeedsFramework = false; SmallVector<Module::UnresolvedHeaderDirective, 1> NewHeaders; const auto Size = File ? (*File)->getSize() : 0; @@ -3067,7 +3067,7 @@ bool ModuleMap::parseModuleMapFile(const FileEntry *File, bool IsSystem, } assert(Target && "Missing target information"); - llvm::Optional<llvm::MemoryBufferRef> Buffer = SourceMgr.getBufferOrNone(ID); + std::optional<llvm::MemoryBufferRef> Buffer = SourceMgr.getBufferOrNone(ID); if (!Buffer) return ParsedModuleMap[File] = true; assert((!Offset || *Offset <= Buffer->getBufferSize()) && |