diff options
Diffstat (limited to 'compiler/elf_writer_mclinker.cc')
| -rw-r--r-- | compiler/elf_writer_mclinker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/elf_writer_mclinker.cc b/compiler/elf_writer_mclinker.cc index aa4a5b2c07..0e2721014a 100644 --- a/compiler/elf_writer_mclinker.cc +++ b/compiler/elf_writer_mclinker.cc @@ -159,7 +159,7 @@ void ElfWriterMclinker::Init() { void ElfWriterMclinker::AddOatInput(std::vector<uint8_t>& oat_contents) { // Add an artificial memory input. Based on LinkerTest. std::string error_msg; - UniquePtr<OatFile> oat_file(OatFile::OpenMemory(oat_contents, elf_file_->GetPath(), &error_msg)); + std::unique_ptr<OatFile> oat_file(OatFile::OpenMemory(oat_contents, elf_file_->GetPath(), &error_msg)); CHECK(oat_file.get() != NULL) << elf_file_->GetPath() << ": " << error_msg; const char* oat_data_start = reinterpret_cast<const char*>(&oat_file->GetOatHeader()); @@ -347,7 +347,7 @@ bool ElfWriterMclinker::Link() { void ElfWriterMclinker::FixupOatMethodOffsets(const std::vector<const DexFile*>& dex_files) { std::string error_msg; - UniquePtr<ElfFile> elf_file(ElfFile::Open(elf_file_, true, false, &error_msg)); + std::unique_ptr<ElfFile> elf_file(ElfFile::Open(elf_file_, true, false, &error_msg)); CHECK(elf_file.get() != NULL) << elf_file_->GetPath() << ": " << error_msg; uint32_t oatdata_address = GetOatDataAddress(elf_file.get()); |