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/oat_writer.h | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 | |
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/oat_writer.h')
| -rw-r--r-- | compiler/oat_writer.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index 7a41d87..8c20aa8 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -18,15 +18,14 @@ #define ART_COMPILER_OAT_WRITER_H_ #include <stdint.h> - #include <cstddef> +#include <memory> #include "driver/compiler_driver.h" #include "mem_map.h" #include "oat.h" #include "mirror/class.h" #include "safe_map.h" -#include "UniquePtrCompat.h" namespace art { @@ -256,16 +255,16 @@ class OatWriter { OatHeader* oat_header_; std::vector<OatDexFile*> oat_dex_files_; std::vector<OatClass*> oat_classes_; - UniquePtr<const std::vector<uint8_t> > interpreter_to_interpreter_bridge_; - UniquePtr<const std::vector<uint8_t> > interpreter_to_compiled_code_bridge_; - UniquePtr<const std::vector<uint8_t> > jni_dlsym_lookup_; - UniquePtr<const std::vector<uint8_t> > portable_imt_conflict_trampoline_; - UniquePtr<const std::vector<uint8_t> > portable_resolution_trampoline_; - UniquePtr<const std::vector<uint8_t> > portable_to_interpreter_bridge_; - UniquePtr<const std::vector<uint8_t> > quick_generic_jni_trampoline_; - UniquePtr<const std::vector<uint8_t> > quick_imt_conflict_trampoline_; - UniquePtr<const std::vector<uint8_t> > quick_resolution_trampoline_; - UniquePtr<const std::vector<uint8_t> > quick_to_interpreter_bridge_; + std::unique_ptr<const std::vector<uint8_t>> interpreter_to_interpreter_bridge_; + std::unique_ptr<const std::vector<uint8_t>> interpreter_to_compiled_code_bridge_; + std::unique_ptr<const std::vector<uint8_t>> jni_dlsym_lookup_; + std::unique_ptr<const std::vector<uint8_t>> portable_imt_conflict_trampoline_; + std::unique_ptr<const std::vector<uint8_t>> portable_resolution_trampoline_; + std::unique_ptr<const std::vector<uint8_t>> portable_to_interpreter_bridge_; + std::unique_ptr<const std::vector<uint8_t>> quick_generic_jni_trampoline_; + std::unique_ptr<const std::vector<uint8_t>> quick_imt_conflict_trampoline_; + std::unique_ptr<const std::vector<uint8_t>> quick_resolution_trampoline_; + std::unique_ptr<const std::vector<uint8_t>> quick_to_interpreter_bridge_; // output stats uint32_t size_dex_file_alignment_; |