diff options
author | Sergio Martins <smartins@kde.org> | 2021-12-02 11:05:51 +0000 |
---|---|---|
committer | Sergio Martins <smartins@kde.org> | 2021-12-02 11:05:51 +0000 |
commit | b74c8729b7b71528c1528579435cda7fdb5d31b4 (patch) | |
tree | 8762bf41c66a616bb503096e30ec428475262a5e | |
parent | fca73257a803dd8d0524e2e0d6927733c500be78 (diff) |
Fix build with some newer gcc complaining about deleted Lexer
-rw-r--r-- | src/SourceCompatibilityHelpers.h | 16 | ||||
-rw-r--r-- | src/SuppressionManager.cpp | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h index b01f16ac..a3bf2680 100644 --- a/src/SourceCompatibilityHelpers.h +++ b/src/SourceCompatibilityHelpers.h @@ -117,17 +117,13 @@ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *in } #if LLVM_VERSION_MAJOR >= 12 -inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile, - const clang::SourceManager &sm, const clang::LangOptions &lo) -{ - return clang::Lexer(id, inputFile.getValue(), sm, lo); -} + +#define GET_LEXER(id, inputFile, sm, lo) \ +clang::Lexer(id, inputFile.getValue(), sm, lo) + #else -inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile, - const clang::SourceManager &sm, const clang::LangOptions &lo) -{ - return clang::Lexer(id, inputFile, sm, lo); -} +#define GET_LEXER(id, inputFile, sm, lo) \ +clang::Lexer(id, inputFile.getValue(), sm, lo) #endif inline bool isFinal(const clang::CXXRecordDecl *record) diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp index 9881388d..88c8aa2c 100644 --- a/src/SuppressionManager.cpp +++ b/src/SuppressionManager.cpp @@ -91,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla return; } - auto lexer = clazy::getLexer(id, buffer, sm, lo); + auto lexer = GET_LEXER(id, buffer, sm, lo); lexer.SetCommentRetentionState(true); Token token; |