summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-12-19 13:16:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2022-12-19 19:27:36 +0000
commitb5023fa9abea248831271df99df0810351bd8c21 (patch)
tree1d9f9c6bab0de9ca168b5da7e96df2083801be82 /compilerplugins
parent8b39cdfa8d725d65bbcb372b7cbf8ee0d7afa106 (diff)
Adapt to clang::PPCallbacks::InclusionDirective change in Clang 16 trunk
<https://github.com/llvm/llvm-project/commit/8f0df9f3bbc6d7f3d5cbfd955c5ee4404c53a75d> "[clang] Convert OptionalFileEntryRefDegradesToFileEntryPtr to std::optional" Change-Id: I60bf4a770d6037edcfe0129591fd46941c8903db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144471 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/includeform.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/compilerplugins/clang/includeform.cxx b/compilerplugins/clang/includeform.cxx
index 7b2c0feb07ea..e640e14b6859 100644
--- a/compilerplugins/clang/includeform.cxx
+++ b/compilerplugins/clang/includeform.cxx
@@ -29,7 +29,9 @@ private:
void InclusionDirective(
SourceLocation HashLoc, Token const & IncludeTok, StringRef,
bool IsAngled, CharSourceRange FilenameRange,
-#if CLANG_VERSION >= 150000
+#if CLANG_VERSION >= 160000
+ std::optional<FileEntryRef> File,
+#elif CLANG_VERSION >= 150000
Optional<FileEntryRef> File,
#else
FileEntry const * File,