diff options
author | Zinovy Nis <zinovy.nis@gmail.com> | 2018-04-06 20:39:23 +0000 |
---|---|---|
committer | Zinovy Nis <zinovy.nis@gmail.com> | 2018-04-06 20:39:23 +0000 |
commit | f6ac0afa4e22339085ce5f4c0ec12a9160d4099e (patch) | |
tree | 27767e5b5715dc7aa7323822992f5bd118197852 /clang-tidy/bugprone | |
parent | 016f795832633f509a3fa03f64a84a5359b6fe38 (diff) |
[clang-tidy] Fix compilation for ParentVirtualCallCheck.cpp
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@329452 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'clang-tidy/bugprone')
-rwxr-xr-x | clang-tidy/bugprone/ParentVirtualCallCheck.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/clang-tidy/bugprone/ParentVirtualCallCheck.cpp b/clang-tidy/bugprone/ParentVirtualCallCheck.cpp index bfbba87c..865396df 100755 --- a/clang-tidy/bugprone/ParentVirtualCallCheck.cpp +++ b/clang-tidy/bugprone/ParentVirtualCallCheck.cpp @@ -11,8 +11,8 @@ #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Tooling/FixIt.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" +#include <algorithm> #include <cctype> using namespace clang::ast_matchers; @@ -27,11 +27,13 @@ static bool isParentOf(const CXXRecordDecl &Parent, const CXXRecordDecl &ThisClass) { if (Parent.getCanonicalDecl() == ThisClass.getCanonicalDecl()) return true; - const auto ClassIter = llvm::find_if(ThisClass.bases(), [=](auto &Base) { - auto *BaseDecl = Base.getType()->getAsCXXRecordDecl(); - assert(BaseDecl); - return Parent.getCanonicalDecl() == BaseDecl->getCanonicalDecl(); - }); + const auto ClassIter = std::find_if( + ThisClass.bases().begin(), ThisClass.bases().end(), + [=](const CXXBaseSpecifier &Base) { + auto *BaseDecl = Base.getType()->getAsCXXRecordDecl(); + assert(BaseDecl); + return Parent.getCanonicalDecl() == BaseDecl->getCanonicalDecl(); + }); return ClassIter != ThisClass.bases_end(); } @@ -74,7 +76,8 @@ static std::string getNameAsString(const NamedDecl *Decl) { static std::string getExprAsString(const clang::Expr &E, clang::ASTContext &AC) { std::string Text = tooling::fixit::getText(E, AC).str(); - Text.erase(llvm::remove_if(Text, std::isspace), Text.end()); + Text.erase(std::remove_if(Text.begin(), Text.end(), std::isspace), + Text.end()); return Text; } |