Merge remote-tracking branch 'origin/merge_35'

src/IceTranslator.cpp

Index: src/IceTranslator.cpp
diff --git a/src/IceTranslator.cpp b/src/IceTranslator.cpp
index 954da474018d51d3cac732fb5af66432f9b05430..2a50a410c90a0db122a87e32ca846d51b5df8d30 100644
--- a/src/IceTranslator.cpp
+++ b/src/IceTranslator.cpp
@@ -103,7 +103,7 @@ void Translator::emitConstants() {
 
 void Translator::lowerGlobals(
     const VariableDeclarationListType &VariableDeclarations) {
-  llvm::OwningPtr<TargetGlobalInitLowering> GlobalLowering(
+  std::unique_ptr<TargetGlobalInitLowering> GlobalLowering(
       TargetGlobalInitLowering::createLowering(Ctx->getTargetArch(), Ctx));
   bool DisableTranslation = Ctx->getFlags().DisableTranslation;
   const bool DumpGlobalVariables =