From 71e3c1f9dee1efda2efb103bedf2b719450f0755 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Thu, 1 May 2014 21:40:37 +0000
Subject: [PATCH] Revert "Use make_unique<T>(...) rather than unique_ptr<T>(new
 T(...))"

Seems to be crashing clang (3.3 and 3.4) on some buildbots...

This reverts commit r207792.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207799 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/Tooling/Tooling.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/clang/Tooling/Tooling.h b/include/clang/Tooling/Tooling.h
index 909ca2fea7..a0d6cb789c 100644
--- a/include/clang/Tooling/Tooling.h
+++ b/include/clang/Tooling/Tooling.h
@@ -39,7 +39,6 @@
 #include "clang/Tooling/CompilationDatabase.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Twine.h"
-#include "llvm/ADT/STLExtras.h"
 #include <memory>
 #include <string>
 #include <vector>
@@ -312,7 +311,8 @@ std::unique_ptr<FrontendActionFactory> newFrontendActionFactory() {
     clang::FrontendAction *create() override { return new T; }
   };
 
-  return llvm::make_unique<SimpleFrontendActionFactory>();
+  return std::unique_ptr<FrontendActionFactory>(
+      new SimpleFrontendActionFactory);
 }
 
 template <typename FactoryT>
@@ -363,8 +363,8 @@ inline std::unique_ptr<FrontendActionFactory> newFrontendActionFactory(
     SourceFileCallbacks *Callbacks;
   };
 
-  return llvm::make_unique<FrontendActionFactoryAdapter>(ConsumerFactory,
-                                                         Callbacks);
+  return std::unique_ptr<FrontendActionFactory>(
+      new FrontendActionFactoryAdapter(ConsumerFactory, Callbacks));
 }
 
 /// \brief Returns the absolute path of \c File, by prepending it with
-- 
2.40.0