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/dex_file.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 'runtime/dex_file.h')
| -rw-r--r-- | runtime/dex_file.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/dex_file.h b/runtime/dex_file.h index 0146f316a7..1d5032d05f 100644 --- a/runtime/dex_file.h +++ b/runtime/dex_file.h @@ -17,6 +17,7 @@ #ifndef ART_RUNTIME_DEX_FILE_H_ #define ART_RUNTIME_DEX_FILE_H_ +#include <memory> #include <string> #include <vector> @@ -28,7 +29,6 @@ #include "mem_map.h" #include "modifiers.h" #include "safe_map.h" -#include "UniquePtrCompat.h" namespace art { @@ -870,7 +870,7 @@ class DexFile { const uint32_t location_checksum_; // Manages the underlying memory allocation. - UniquePtr<MemMap> mem_map_; + std::unique_ptr<MemMap> mem_map_; // Points to the header section. const Header* const header_; |