LLVM 3.5 merge: Subzero

src/IceTranslator.h

Index: src/IceTranslator.h
diff --git a/src/IceTranslator.h b/src/IceTranslator.h
index b5adbdc93e5a96a01323e5156134ac97fc559241..ebabbdb2d3dbbed47b30ae3b923b7c0db6ba5fa9 100644
--- a/src/IceTranslator.h
+++ b/src/IceTranslator.h
@@ -15,7 +15,9 @@
 #ifndef SUBZERO_SRC_ICETRANSLATOR_H
 #define SUBZERO_SRC_ICETRANSLATOR_H
 
-#include "llvm/ADT/OwningPtr.h"
+#include "llvm/Support/Compiler.h"
+
+#include <memory>
 
 namespace llvm {
 class Module;
@@ -75,7 +77,7 @@ protected:
   // object, change all Constant related functions to use
   // GlobalContext instead of Cfg, and then make emitConstantPool use
   // that.
-  llvm::OwningPtr<Cfg> Func;
+  std::unique_ptr<Cfg> Func;
 
 private:
   Translator(const Translator &) LLVM_DELETED_FUNCTION;