diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /compiler/elf_writer_mclinker.h | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip | |
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
Diffstat (limited to 'compiler/elf_writer_mclinker.h')
| -rw-r--r-- | compiler/elf_writer_mclinker.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 3c1a47b001..955e5d2614 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -17,9 +17,9 @@ #ifndef ART_COMPILER_ELF_WRITER_MCLINKER_H_ #define ART_COMPILER_ELF_WRITER_MCLINKER_H_ -#include "elf_writer.h" +#include <memory> -#include "UniquePtrCompat.h" +#include "elf_writer.h" #include "safe_map.h" namespace mcld { @@ -73,11 +73,11 @@ class ElfWriterMclinker FINAL : public ElfWriter { const CompiledCode& compiled_code); // Setup by Init() - UniquePtr<mcld::LinkerConfig> linker_config_; - UniquePtr<mcld::LinkerScript> linker_script_; - UniquePtr<mcld::Module> module_; - UniquePtr<mcld::IRBuilder> ir_builder_; - UniquePtr<mcld::Linker> linker_; + std::unique_ptr<mcld::LinkerConfig> linker_config_; + std::unique_ptr<mcld::LinkerScript> linker_script_; + std::unique_ptr<mcld::Module> module_; + std::unique_ptr<mcld::IRBuilder> ir_builder_; + std::unique_ptr<mcld::Linker> linker_; // Setup by AddOatInput() // TODO: ownership of oat_input_? |