diff options
| author | Björn Schäpers <bjoern@hazardy.de> | 2024-04-30 16:06:28 +0200 |
|---|---|---|
| committer | Björn Schäpers <qt-codereview@hazardy.de> | 2024-05-02 19:14:36 +0000 |
| commit | cc9ffdb685119a7c11248f08cf88308927252b85 (patch) | |
| tree | f0e0b367c6cc271201ad739b8f3cd552e60d75fc /src/plugins | |
| parent | a0b19d9fba713232527d84a7c124e335f567678f (diff) | |
ClangFormat: Fix compiliation with LLVM19
Change-Id: I4b166da2e477ffd101a5c4b9aa07c710f7698da9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/clangformat/clangformatbaseindenter.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/clangformat/llvmfilesystem.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp index 1d5dc2730c..b491bd293f 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.cpp +++ b/src/plugins/clangformat/clangformatbaseindenter.cpp @@ -65,7 +65,11 @@ static void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style, static llvm::StringRef clearExtraNewline(llvm::StringRef text) { +#if LLVM_VERSION_MAJOR >= 16 + while (text.starts_with("\n\n")) +#else while (text.startswith("\n\n")) +#endif text = text.drop_front(); return text; } diff --git a/src/plugins/clangformat/llvmfilesystem.h b/src/plugins/clangformat/llvmfilesystem.h index fface01fc0..b2d1c5de7e 100644 --- a/src/plugins/clangformat/llvmfilesystem.h +++ b/src/plugins/clangformat/llvmfilesystem.h @@ -127,7 +127,11 @@ public: /// Gets real path of \p Path e.g. collapse all . and .. patterns, resolve /// symlinks. For real file system, this uses `llvm::sys::fs::real_path`. /// This returns errc::operation_not_permitted if not implemented by subclass. - std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output) const override + std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output) +#if LLVM_VERSION_MAJOR < 19 + const +#endif + override { Q_UNUSED(Path); Q_UNUSED(Output); |