From 700a402244a1a423da4f3ba8032459f4b65fa18f Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Mon, 19 May 2014 16:49:03 -0700 Subject: Now we have a proper C++ library, use std::unique_ptr. Also remove the Android.libcxx.mk and other bits of stlport compatibility mechanics. Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61 --- compiler/llvm/compiler_llvm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/llvm/compiler_llvm.cc') 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 cunit(AllocateCompilationUnit()); + std::unique_ptr 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 cunit(AllocateCompilationUnit()); + std::unique_ptr cunit(AllocateCompilationUnit()); - UniquePtr jni_compiler( + std::unique_ptr jni_compiler( new JniCompiler(cunit.get(), compiler_driver_, dex_compilation_unit)); return jni_compiler->Compile(); -- cgit v1.2.3-59-g8ed1b