From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 12 Nov 2014 03:17:33 +0000 (+0000)
Subject: Revert "Use a function_ref now that it works (r221753)."
X-Git-Tag: android-x86-7.1-r4~55613
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=214b84bf0eaffd9f498921b0214af315b4264e98;p=android-x86%2Fexternal-llvm.git

Revert "Use a function_ref now that it works (r221753)."

This reverts commit r221756.

David Blaikie pointed out it was unsafe.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221761 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Linker/Linker.h b/include/llvm/Linker/Linker.h
index 4d1a32d7810..d1c02c241d5 100644
--- a/include/llvm/Linker/Linker.h
+++ b/include/llvm/Linker/Linker.h
@@ -11,8 +11,8 @@
 #define LLVM_LINKER_LINKER_H
 
 #include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/STLExtras.h"
 
+#include <functional>
 
 namespace llvm {
 class DiagnosticInfo;
@@ -25,7 +25,7 @@ class StructType;
 /// something with it after the linking.
 class Linker {
   public:
-    typedef function_ref<void(const DiagnosticInfo &)>
+    typedef std::function<void(const DiagnosticInfo &)>
         DiagnosticHandlerFunction;
 
     Linker(Module *M, DiagnosticHandlerFunction DiagnosticHandler);