[Libreoffice-commits] core.git: compilerplugins/clang
Stephan Bergmann
sbergman at redhat.com
Mon May 14 11:54:46 UTC 2018
compilerplugins/clang/includeform.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 267240ecf71b71c0d4234ee32b745e8789f39089
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon May 14 11:17:30 2018 +0200
Adapt compilerplugins to recent Clang trunk change
Change-Id: I3013799433e7b82d6b869e9a3cf071495a12d5ae
Reviewed-on: https://gerrit.libreoffice.org/54304
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/compilerplugins/clang/includeform.cxx b/compilerplugins/clang/includeform.cxx
index c26a2aea76d6..fe7bad18918f 100644
--- a/compilerplugins/clang/includeform.cxx
+++ b/compilerplugins/clang/includeform.cxx
@@ -9,6 +9,8 @@
#include <memory>
+#include "config_clang.h"
+
#include "compat.hxx"
#include "plugin.hxx"
@@ -26,7 +28,11 @@ private:
void InclusionDirective(
SourceLocation HashLoc, Token const & IncludeTok, StringRef,
bool IsAngled, CharSourceRange FilenameRange, FileEntry const * File,
- StringRef SearchPath, StringRef, clang::Module const *) override
+ StringRef SearchPath, StringRef, clang::Module const *
+#if CLANG_VERSION >= 70000
+ , SrcMgr::CharacteristicKind
+#endif
+ ) override
{
if (ignoreLocation(HashLoc)) {
return;
More information about the Libreoffice-commits
mailing list