From 35013fa3903277bc4edf3bd3543d92df877148c1 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 25 Apr 2014 15:21:43 +0000
Subject: [PATCH] Slightly less blindly fixing clang-tools-extra now that I
 remember that the "check-clang" target doesn't check clang-tools-extra

llvm-svn: 207231
---
 clang-tools-extra/clang-query/Query.cpp            |  5 +----
 .../unittests/clang-query/QueryEngineTest.cpp      | 25 +++++++++++-----------
 .../unittests/clang-query/QueryParserTest.cpp      |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 65a68ed..ef29e6b 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -59,10 +59,7 @@ struct CollectBoundNodes : MatchFinder::MatchCallback {
 bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
   unsigned MatchCount = 0;
 
-  for (llvm::ArrayRef<ASTUnit *>::iterator I = QS.ASTs.begin(),
-                                           E = QS.ASTs.end();
-       I != E; ++I) {
-    ASTUnit *AST = *I;
+  for (auto &AST : QS.ASTs) {
     MatchFinder Finder;
     std::vector<BoundNodes> Matches;
     DynTypedMatcher MaybeBoundMatcher = Matcher;
diff --git a/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp b/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp
index 7010004..05ce0fb 100644
--- a/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp
+++ b/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp
@@ -26,23 +26,22 @@ using namespace clang::query;
 using namespace clang::tooling;
 
 class QueryEngineTest : public ::testing::Test {
-  ArrayRef<ASTUnit *> mkASTUnit2(ASTUnit *a, ASTUnit *b) {
-    ASTs[0] = a;
-    ASTs[1] = b;
-    return ArrayRef<ASTUnit *>(ASTs);
+  ArrayRef<std::unique_ptr<ASTUnit>> mkASTUnit2(std::unique_ptr<ASTUnit> a,
+                                                std::unique_ptr<ASTUnit> b) {
+    ASTs[0] = std::move(a);
+    ASTs[1] = std::move(b);
+    return ArrayRef<std::unique_ptr<ASTUnit>>(ASTs);
   }
 
 protected:
   QueryEngineTest()
-      : FooAST(buildASTFromCode("void foo1(void) {}\nvoid foo2(void) {}",
-                                "foo.cc")),
-        BarAST(buildASTFromCode("void bar1(void) {}\nvoid bar2(void) {}",
-                                "bar.cc")),
-        S(mkASTUnit2(FooAST.get(), BarAST.get())), OS(Str) {}
-
-  std::unique_ptr<ASTUnit> FooAST;
-  std::unique_ptr<ASTUnit> BarAST;
-  ASTUnit *ASTs[2];
+      : S(mkASTUnit2(std::unique_ptr<ASTUnit>(buildASTFromCode(
+                         "void foo1(void) {}\nvoid foo2(void) {}", "foo.cc")),
+                     std::unique_ptr<ASTUnit>(buildASTFromCode(
+                         "void bar1(void) {}\nvoid bar2(void) {}", "bar.cc")))),
+        OS(Str) {}
+
+  std::unique_ptr<ASTUnit> ASTs[2];
   QuerySession S;
 
   std::string Str;
diff --git a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
index e54d3b6..75b54e3 100644
--- a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
+++ b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
@@ -18,7 +18,7 @@ using namespace clang::query;
 
 class QueryParserTest : public ::testing::Test {
 protected:
-  QueryParserTest() : QS(llvm::ArrayRef<ASTUnit *>()) {}
+  QueryParserTest() : QS(llvm::ArrayRef<std::unique_ptr<ASTUnit>>()) {}
   QueryRef parse(StringRef Code) { return QueryParser::parse(Code, QS); }
 
   QuerySession QS;
-- 
2.7.4