diff options
| -rw-r--r-- | src/SourceCompatibilityHelpers.h | 10 | ||||
| -rw-r--r-- | src/checks/level2/old-style-connect.cpp | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h index 35f0c737..01adbefe 100644 --- a/src/SourceCompatibilityHelpers.h +++ b/src/SourceCompatibilityHelpers.h @@ -39,16 +39,6 @@ inline clang::SourceLocation getLocEnd(const T *t) #endif } -inline clang::CharSourceRange getImmediateExpansionRange(clang::SourceLocation macroLoc, const clang::SourceManager &sm) -{ -#if LLVM_VERSION_MAJOR >= 7 - return sm.getImmediateExpansionRange(macroLoc); -#else - auto pair = sm.getImmediateExpansionRange(macroLoc); - return clang::CharSourceRange(clang::SourceRange(pair.first, pair.second), false); -#endif -} - inline bool hasUnusedResultAttr(clang::FunctionDecl *func) { #if LLVM_VERSION_MAJOR >= 8 diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp index 46e38112..cfed83b4 100644 --- a/src/checks/level2/old-style-connect.cpp +++ b/src/checks/level2/old-style-connect.cpp @@ -292,7 +292,7 @@ std::string OldStyleConnect::signalOrSlotNameFromMacro(SourceLocation macroLoc) return "error"; } - CharSourceRange expansionRange = clazy::getImmediateExpansionRange(macroLoc, sm()); + CharSourceRange expansionRange = sm().getImmediateExpansionRange(macroLoc); SourceRange range = SourceRange(expansionRange.getBegin(), expansionRange.getEnd()); auto charRange = Lexer::getAsCharRange(range, sm(), lo()); const std::string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo())); @@ -480,7 +480,7 @@ std::vector<FixItHint> OldStyleConnect::fixits(int classification, T *callOrCtor qualifiedName = clazy::getMostNeededQualifiedName(sm(), methodDecl, context, locStart, !isInInclude); // (In includes ignore using directives) } - CharSourceRange expansionRange = clazy::getImmediateExpansionRange(s, sm()); + CharSourceRange expansionRange = sm().getImmediateExpansionRange(s); SourceRange range = SourceRange(expansionRange.getBegin(), expansionRange.getEnd()); const std::string functionPointer = '&' + qualifiedName; |