diff options
Diffstat (limited to 'lldb/source/Plugins/ObjectContainer')
| -rw-r--r-- | lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp | 20 | ||||
| -rw-r--r-- | lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp index 64de171549e..50e474917d7 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp @@ -320,18 +320,18 @@ ObjectContainer *ObjectContainerBSDArchive::CreateInstance( Archive::shared_ptr archive_sp(Archive::FindCachedArchive( *file, module_sp->GetArchitecture(), module_sp->GetModificationTime(), file_offset)); - std::unique_ptr<ObjectContainerBSDArchive> container_ap( + std::unique_ptr<ObjectContainerBSDArchive> container_up( new ObjectContainerBSDArchive(module_sp, archive_data_sp, archive_data_offset, file, file_offset, length)); - if (container_ap) { + if (container_up) { if (archive_sp) { // We already have this archive in our cache, use it - container_ap->SetArchive(archive_sp); - return container_ap.release(); - } else if (container_ap->ParseHeader()) - return container_ap.release(); + container_up->SetArchive(archive_sp); + return container_up.release(); + } else if (container_up->ParseHeader()) + return container_up.release(); } } } else { @@ -340,14 +340,14 @@ ObjectContainer *ObjectContainerBSDArchive::CreateInstance( *file, module_sp->GetArchitecture(), module_sp->GetModificationTime(), file_offset)); if (archive_sp) { - std::unique_ptr<ObjectContainerBSDArchive> container_ap( + std::unique_ptr<ObjectContainerBSDArchive> container_up( new ObjectContainerBSDArchive(module_sp, data_sp, data_offset, file, file_offset, length)); - if (container_ap) { + if (container_up) { // We already have this archive in our cache, use it - container_ap->SetArchive(archive_sp); - return container_ap.release(); + container_up->SetArchive(archive_sp); + return container_up.release(); } } } diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp index 808e4691c20..9e4dc5af0a4 100644 --- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp +++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp @@ -49,11 +49,11 @@ ObjectContainer *ObjectContainerUniversalMachO::CreateInstance( DataExtractor data; data.SetData(data_sp, data_offset, length); if (ObjectContainerUniversalMachO::MagicBytesMatch(data)) { - std::unique_ptr<ObjectContainerUniversalMachO> container_ap( + std::unique_ptr<ObjectContainerUniversalMachO> container_up( new ObjectContainerUniversalMachO(module_sp, data_sp, data_offset, file, file_offset, length)); - if (container_ap->ParseHeader()) { - return container_ap.release(); + if (container_up->ParseHeader()) { + return container_up.release(); } } } |
