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_fixup.cc | |
| 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 'compiler/elf_fixup.cc')
| -rw-r--r-- | compiler/elf_fixup.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/elf_fixup.cc b/compiler/elf_fixup.cc index 571a091c8e..404e3f8692 100644 --- a/compiler/elf_fixup.cc +++ b/compiler/elf_fixup.cc @@ -17,12 +17,12 @@ #include "elf_fixup.h" #include <inttypes.h> +#include <memory> #include "base/logging.h" #include "base/stringprintf.h" #include "elf_file.h" #include "elf_writer.h" -#include "UniquePtrCompat.h" namespace art { @@ -30,7 +30,7 @@ static const bool DEBUG_FIXUP = false; bool ElfFixup::Fixup(File* file, uintptr_t oat_data_begin) { std::string error_msg; - UniquePtr<ElfFile> elf_file(ElfFile::Open(file, true, false, &error_msg)); + std::unique_ptr<ElfFile> elf_file(ElfFile::Open(file, true, false, &error_msg)); CHECK(elf_file.get() != nullptr) << error_msg; // Lookup "oatdata" symbol address. |