diff options
| author | 2014-05-20 05:29:04 +0000 | |
|---|---|---|
| committer | 2014-05-20 05:29:04 +0000 | |
| commit | 607fa7b07233a7233ebe21bba8f3e7c1925ae0f2 (patch) | |
| tree | a04f1074331ac82ad077044e3f373312f61e5901 /compiler/llvm/compiler_llvm.cc | |
| parent | 1dc387152a84193937bd1f88e9e10fff6449d695 (diff) | |
| parent | 700a402244a1a423da4f3ba8032459f4b65fa18f (diff) | |
Merge "Now we have a proper C++ library, use std::unique_ptr."
Diffstat (limited to 'compiler/llvm/compiler_llvm.cc')
| -rw-r--r-- | compiler/llvm/compiler_llvm.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/llvm/compiler_llvm.cc b/compiler/llvm/compiler_llvm.cc index df895ee07d..5990e8caea 100644 --- a/compiler/llvm/compiler_llvm.cc +++ b/compiler/llvm/compiler_llvm.cc @@ -136,7 +136,7 @@ LlvmCompilationUnit* CompilerLLVM::AllocateCompilationUnit() { CompiledMethod* CompilerLLVM:: CompileDexMethod(DexCompilationUnit* dex_compilation_unit, InvokeType invoke_type) { - UniquePtr<LlvmCompilationUnit> cunit(AllocateCompilationUnit()); + std::unique_ptr<LlvmCompilationUnit> cunit(AllocateCompilationUnit()); cunit->SetDexCompilationUnit(dex_compilation_unit); cunit->SetCompilerDriver(compiler_driver_); @@ -163,9 +163,9 @@ CompileDexMethod(DexCompilationUnit* dex_compilation_unit, InvokeType invoke_typ CompiledMethod* CompilerLLVM:: CompileNativeMethod(DexCompilationUnit* dex_compilation_unit) { - UniquePtr<LlvmCompilationUnit> cunit(AllocateCompilationUnit()); + std::unique_ptr<LlvmCompilationUnit> cunit(AllocateCompilationUnit()); - UniquePtr<JniCompiler> jni_compiler( + std::unique_ptr<JniCompiler> jni_compiler( new JniCompiler(cunit.get(), compiler_driver_, dex_compilation_unit)); return jni_compiler->Compile(); |