LLVM 3.5 merge: Subzero

src/IceTranslator.h

 //===- subzero/src/IceTranslator.h - ICE to machine code --------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares the general driver class for translating ICE to
 // machine code.
 //
 //===----------------------------------------------------------------------===//
 
 #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;
 }
 
 namespace Ice {
 
 class ClFlags;
 class Cfg;
 class GlobalContext;
@@ skipping 39 matching lines @@
   // otherwise.
   bool ErrorStatus;
   // Ideally, Func would be inside the methods that converts IR to
   // functions.  However, emitting the constant pool requires a valid
   // Cfg object, so we need to defer deleting the last non-empty Cfg
   // object to emit the constant pool (via emitConstants). TODO:
   // Since all constants are globally pooled in the GlobalContext
   // 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;
   Translator &operator=(const Translator &) LLVM_DELETED_FUNCTION;
 };
 }
 
 #endif // SUBZERO_SRC_ICETRANSLATOR_H