diff options
author | Kazu Hirata <kazu@google.com> | 2022-12-09 23:12:19 -0800 |
---|---|---|
committer | Kazu Hirata <kazu@google.com> | 2022-12-09 23:12:19 -0800 |
commit | e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f (patch) | |
tree | 153773d983592e519d73adc795507ea6d1950f2c /clang/lib/Frontend/ASTUnit.cpp | |
parent | 538401da1d16e4ca84423f6da3526c72b2fdb493 (diff) | |
download | llvm-e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f.zip llvm-e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f.tar.gz llvm-e90e8487dce37ace5cfabb5b27cb0dc0ba5b566f.tar.bz2 |
[Frontend] Use std::optional in ASTUnit.cpp (NFC)
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/Frontend/ASTUnit.cpp')
-rw-r--r-- | clang/lib/Frontend/ASTUnit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp index c133746..f5d4b56 100644 --- a/clang/lib/Frontend/ASTUnit.cpp +++ b/clang/lib/Frontend/ASTUnit.cpp @@ -99,6 +99,7 @@ #include <cstdlib> #include <memory> #include <mutex> +#include <optional> #include <string> #include <tuple> #include <utility> @@ -734,7 +735,7 @@ void FilterAndStoreDiagnosticConsumer::HandleDiagnostic( } if (StandaloneDiags) { - llvm::Optional<StoredDiagnostic> StoredDiag; + std::optional<StoredDiagnostic> StoredDiag; if (!ResultDiag) { StoredDiag.emplace(Level, Info); ResultDiag = &*StoredDiag; @@ -1378,7 +1379,7 @@ ASTUnit::getMainBufferWithPrecompiledPreamble( SmallVector<StoredDiagnostic, 4> NewPreambleDiags; ASTUnitPreambleCallbacks Callbacks; { - llvm::Optional<CaptureDroppedDiagnostics> Capture; + std::optional<CaptureDroppedDiagnostics> Capture; if (CaptureDiagnostics != CaptureDiagsKind::None) Capture.emplace(CaptureDiagnostics, *Diagnostics, &NewPreambleDiags, &NewPreambleDiagsStandalone); @@ -2243,7 +2244,7 @@ void ASTUnit::CodeComplete( Clang->setCodeCompletionConsumer(AugmentedConsumer); auto getUniqueID = - [&FileMgr](StringRef Filename) -> Optional<llvm::sys::fs::UniqueID> { + [&FileMgr](StringRef Filename) -> std::optional<llvm::sys::fs::UniqueID> { if (auto Status = FileMgr.getVirtualFileSystem().status(Filename)) return Status->getUniqueID(); return std::nullopt; |