LLVM 3.5 merge: Subzero

src/IceGlobalContext.h

Index: src/IceGlobalContext.h
diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index f997b65f1ba22e698bd5dc17ad1d649234dd9b57..005bcc2dcdcbbdad7d716bc2ad54f894d3bc437b 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -15,7 +15,6 @@
 #ifndef SUBZERO_SRC_ICEGLOBALCONTEXT_H
 #define SUBZERO_SRC_ICEGLOBALCONTEXT_H
 
-#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -24,6 +23,8 @@
 #include "IceRNG.h"
 #include "IceTypes.h"
 
+#include <memory>
+
 namespace Ice {
 
 class ClFlags;
@@ -160,7 +161,7 @@ private:
 
   llvm::BumpPtrAllocator Allocator;
   VerboseMask VMask;
-  llvm::OwningPtr<class ConstantPool> ConstPool;
+  std::unique_ptr<class ConstantPool> ConstPool;
   Intrinsics IntrinsicsInfo;
   const TargetArch Arch;
   const OptLevel Opt;