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 /runtime/oat_file.h | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 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 'runtime/oat_file.h')
| -rw-r--r-- | runtime/oat_file.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat_file.h b/runtime/oat_file.h index 07d70ff681..d70373172e 100644 --- a/runtime/oat_file.h +++ b/runtime/oat_file.h @@ -262,10 +262,10 @@ class OatFile { const byte* end_; // Backing memory map for oat file during when opened by ElfWriter during initial compilation. - UniquePtr<MemMap> mem_map_; + std::unique_ptr<MemMap> mem_map_; // Backing memory map for oat file during cross compilation. - UniquePtr<ElfFile> elf_file_; + std::unique_ptr<ElfFile> elf_file_; // dlopen handle during runtime. void* dlopen_handle_; |