diff options
Diffstat (limited to 'compiler/llvm/llvm_compilation_unit.h')
-rw-r--r-- | compiler/llvm/llvm_compilation_unit.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/llvm/llvm_compilation_unit.h b/compiler/llvm/llvm_compilation_unit.h index 58aa6fd545..f11fb6ed23 100644 --- a/compiler/llvm/llvm_compilation_unit.h +++ b/compiler/llvm/llvm_compilation_unit.h @@ -17,6 +17,10 @@ #ifndef ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ #define ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#include <memory> +#include <string> +#include <vector> + #include "base/logging.h" #include "base/mutex.h" #include "dex/compiler_internals.h" @@ -28,10 +32,6 @@ #include "runtime_support_llvm_func.h" #include "safe_map.h" -#include <UniquePtr.h> -#include <string> -#include <vector> - namespace art { class CompiledMethod; } @@ -106,12 +106,12 @@ class LlvmCompilationUnit { const CompilerLLVM* compiler_llvm_; const size_t cunit_id_; - UniquePtr< ::llvm::LLVMContext> context_; - UniquePtr<IRBuilder> irb_; - UniquePtr<RuntimeSupportBuilder> runtime_support_; + std::unique_ptr< ::llvm::LLVMContext> context_; + std::unique_ptr<IRBuilder> irb_; + std::unique_ptr<RuntimeSupportBuilder> runtime_support_; ::llvm::Module* module_; // Managed by context_ - UniquePtr<IntrinsicHelper> intrinsic_helper_; - UniquePtr<LLVMInfo> llvm_info_; + std::unique_ptr<IntrinsicHelper> intrinsic_helper_; + std::unique_ptr<LLVMInfo> llvm_info_; CompilerDriver* driver_; DexCompilationUnit* dex_compilation_unit_; |