Blindly try to fix the clang-tools-extra build since my local build doesn't appear to be picking it up

llvm-svn: 207230

2 files changed, 3 insertions, 5 deletions

diff --git a/clang-tools-extra/clang-query/QuerySession.h b/clang-tools-extra/clang-query/QuerySession.h
index b4361003bec..e6a26acd251 100644
--- a/clang-tools-extra/clang-query/QuerySession.h
+++ b/clang-tools-extra/clang-query/QuerySession.h
@@ -24,10 +24,10 @@ namespace query {
 /// Represents the state for a particular clang-query session.
 class QuerySession {
 public:
-  QuerySession(llvm::ArrayRef<ASTUnit *> ASTs)
+  QuerySession(llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs)
       : ASTs(ASTs), OutKind(OK_Diag), BindRoot(true) {}
 
-  llvm::ArrayRef<ASTUnit *> ASTs;
+  llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs;
   OutputKind OutKind;
   bool BindRoot;
   llvm::StringMap<ast_matchers::dynamic::VariantValue> NamedValues;
diff --git a/clang-tools-extra/clang-query/tool/ClangQuery.cpp b/clang-tools-extra/clang-query/tool/ClangQuery.cpp
index d95892618ce..8454359af54 100644
--- a/clang-tools-extra/clang-query/tool/ClangQuery.cpp
+++ b/clang-tools-extra/clang-query/tool/ClangQuery.cpp
@@ -85,7 +85,7 @@ int main(int argc, const char **argv) {
   }
 
   ClangTool Tool(*Compilations, SourcePaths);
-  std::vector<ASTUnit *> ASTs;
+  std::vector<std::unique_ptr<ASTUnit>> ASTs;
   if (Tool.buildASTs(ASTs) != 0)
     return 1;
 
@@ -128,7 +128,5 @@ int main(int argc, const char **argv) {
     }
   }
 
-  llvm::DeleteContainerPointers(ASTs);
-
   return 0;
 }