Chromium Code Reviews

Unified Diff: src/IceTranslator.cpp

Issue 752603003: Merge remote-tracking branch 'origin/merge_35' (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « no previous file | src/PNaClTranslator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « no previous file | src/PNaClTranslator.cpp » ('j') | no next file with comments »

Powered by Google App Engine