| commit | 79f2a03b390c4d3d8acd30bacc44424cf06beb67 | [log] [tgz] |
|---|---|---|
| author | JF Bastien <jfb@chromium.org> | Fri Nov 21 10:02:17 2014 -0800 |
| committer | JF Bastien <jfb@chromium.org> | Fri Nov 21 10:02:17 2014 -0800 |
| tree | 027dd5b8837cb80ba3cc24788a0bd8b1c1666587 | |
| parent | d2cb4361c732dcddc98659415f37be45982e20c3 [diff] [blame] |
Merge remote-tracking branch 'origin/merge_35' R=stichnot@chromium.org BUG= https://code.google.com/p/nativeclient/issues/detail?id=3930 Review URL: https://codereview.chromium.org/752603003
diff --git a/src/IceTranslator.cpp b/src/IceTranslator.cpp index 954da47..2a50a41 100644 --- a/src/IceTranslator.cpp +++ b/src/IceTranslator.cpp
@@ -103,7 +103,7 @@ 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 =