<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Fri, Apr 6, 2018 at 10:42 PM Zinovy Nis via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zinovy.nis<br>
Date: Fri Apr  6 13:39:23 2018<br>
New Revision: 329452<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=329452&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=329452&view=rev</a><br>
Log:<br>
[clang-tidy] Fix compilation for ParentVirtualCallCheck.cpp<br>
<br>
<br>
Modified:<br>
    clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp?rev=329452&r1=329451&r2=329452&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp?rev=329452&r1=329451&r2=329452&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/bugprone/ParentVirtualCallCheck.cpp Fri Apr  6 13:39:23 2018<br>
@@ -11,8 +11,8 @@<br>
 #include "clang/AST/ASTContext.h"<br>
 #include "clang/ASTMatchers/ASTMatchFinder.h"<br>
 #include "clang/Tooling/FixIt.h"<br>
-#include "llvm/ADT/STLExtras.h"<br>
 #include "llvm/ADT/SmallVector.h"<br>
+#include <algorithm><br>
 #include <cctype><br>
<br>
 using namespace clang::ast_matchers;<br>
@@ -27,11 +27,13 @@ static bool isParentOf(const CXXRecordDe<br>
                        const CXXRecordDecl &ThisClass) {<br>
   if (Parent.getCanonicalDecl() == ThisClass.getCanonicalDecl())<br>
     return true;<br>
-  const auto ClassIter = llvm::find_if(ThisClass.bases(), [=](auto &Base) {<br>
-    auto *BaseDecl = Base.getType()->getAsCXXRecordDecl();<br>
-    assert(BaseDecl);<br>
-    return Parent.getCanonicalDecl() == BaseDecl->getCanonicalDecl();<br>
-  });<br>
+  const auto ClassIter = std::find_if(<br></blockquote><div><br></div><div>So what was wrong with llvm::find_if? Why didn't it work here?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+      ThisClass.bases().begin(), ThisClass.bases().end(),<br>
+      [=](const CXXBaseSpecifier &Base) {<br>
+        auto *BaseDecl = Base.getType()->getAsCXXRecordDecl();<br>
+        assert(BaseDecl);<br>
+        return Parent.getCanonicalDecl() == BaseDecl->getCanonicalDecl();<br>
+      });<br>
   return ClassIter != ThisClass.bases_end();<br>
 }<br>
<br>
@@ -74,7 +76,8 @@ static std::string getNameAsString(const<br>
 static std::string getExprAsString(const clang::Expr &E,<br>
                                    clang::ASTContext &AC) {<br>
   std::string Text = tooling::fixit::getText(E, AC).str();<br>
-  Text.erase(llvm::remove_if(Text, std::isspace), Text.end());<br>
+  Text.erase(std::remove_if(Text.begin(), Text.end(), std::isspace),<br>
+             Text.end());<br>
   return Text;<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div>