compilerplugins/clang/includeform.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8fe55893af1f62219f9ebb1da9527ce8aa0fbd81
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Dec 20 09:08:29 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 20 07:52:20 2022 +0000
Adapt to PPCallbacks::InclusionDirective change in Clang 16 trunk
Attempt to follow the unfolding debate here, it was std::optional
briefly, but then that was reverted with
commit 205c0589f918f95d2f2c586a01bea2716d73d603
Revert "[clang] Convert OptionalFileEntryRefDegradesToFileEntryPtr
to std::optional"
and then a different changed landed with
commit 854c10f8d185286d941307e1033eb492e085c203
Date: Tue Dec 20 00:15:11 2022 +0100
[Clang] Prepare for llvm::Optional becoming std::optional.
Change-Id: I0068960a45695014405437206d8d4565562b0af9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144575
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/includeform.cxx
b/compilerplugins/clang/includeform.cxx
index 558c9b423345..583cb059bc40 100644
--- a/compilerplugins/clang/includeform.cxx
+++ b/compilerplugins/clang/includeform.cxx
@@ -31,7 +31,7 @@ private:
SourceLocation HashLoc, Token const & IncludeTok, StringRef,
bool IsAngled, CharSourceRange FilenameRange,
#if CLANG_VERSION >= 160000
- std::optional<FileEntryRef> File,
+ OptionalFileEntryRef File,
#elif CLANG_VERSION >= 150000
Optional<FileEntryRef> File,
#else
