diff options
Diffstat (limited to 'lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp')
| -rw-r--r-- | lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 31916937c0b..7ab38f91770 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -11,7 +11,6 @@ #include <string> #include <vector> -#include <memory> #include <stdint.h> #include "lldb/lldb-enumerations.h" @@ -309,6 +308,10 @@ AppleObjCRuntimeV2::AppleObjCRuntimeV2 (Process *process, m_has_object_getClass = (objc_module_sp->FindFirstSymbolWithNameAndType(g_gdb_object_getClass, eSymbolTypeCode) != NULL); } +AppleObjCRuntimeV2::~AppleObjCRuntimeV2() +{ +} + bool AppleObjCRuntimeV2::GetDynamicTypeAndAddress (ValueObject &in_value, DynamicValueType use_dynamic, @@ -817,9 +820,9 @@ public: if (process) { - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return m_name; @@ -840,7 +843,7 @@ public: if (!process) return ObjCLanguageRuntime::ClassDescriptorSP(); - std::auto_ptr<objc_class_t> objc_class; + STD_UNIQUE_PTR(objc_class_t) objc_class; if (!Read_objc_class(process, objc_class)) return ObjCLanguageRuntime::ClassDescriptorSP(); @@ -869,9 +872,9 @@ public: if (process) { - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return 0; @@ -898,9 +901,9 @@ public: { lldb_private::Process *process = m_runtime.GetProcess(); - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return 0; @@ -914,7 +917,7 @@ public: if (instance_method_func) { - std::auto_ptr <method_list_t> base_method_list; + STD_UNIQUE_PTR(method_list_t) base_method_list; base_method_list.reset(new method_list_t); if (!base_method_list->Read(process, class_ro->m_baseMethods_ptr)) @@ -923,7 +926,7 @@ public: if (base_method_list->m_entsize != method_t::GetSize(process)) return false; - std::auto_ptr <method_t> method; + STD_UNIQUE_PTR(method_t) method; method.reset(new method_t); for (uint32_t i = 0, e = base_method_list->m_count; i < e; ++i) @@ -950,23 +953,20 @@ public: if (ivar_func) { - std::auto_ptr <ivar_list_t> ivar_list; - - ivar_list.reset(new ivar_list_t); - if (!ivar_list->Read(process, class_ro->m_ivars_ptr)) + ivar_list_t ivar_list; + if (!ivar_list.Read(process, class_ro->m_ivars_ptr)) return false; - if (ivar_list->m_entsize != ivar_t::GetSize(process)) + if (ivar_list.m_entsize != ivar_t::GetSize(process)) return false; - std::auto_ptr <ivar_t> ivar; - ivar.reset(new ivar_t); + ivar_t ivar; - for (uint32_t i = 0, e = ivar_list->m_count; i < e; ++i) + for (uint32_t i = 0, e = ivar_list.m_count; i < e; ++i) { - ivar->Read(process, ivar_list->m_first_ptr + (i * ivar_list->m_entsize)); + ivar.Read(process, ivar_list.m_first_ptr + (i * ivar_list.m_entsize)); - if (ivar_func(ivar->m_name.c_str(), ivar->m_type.c_str(), ivar->m_offset_ptr, ivar->m_size)) + if (ivar_func(ivar.m_name.c_str(), ivar.m_type.c_str(), ivar.m_offset_ptr, ivar.m_size)) break; } } @@ -1354,7 +1354,7 @@ private: } }; - bool Read_objc_class (Process* process, std::auto_ptr<objc_class_t> &objc_class) + bool Read_objc_class (Process* process, STD_UNIQUE_PTR(objc_class_t) &objc_class) { objc_class.reset(new objc_class_t); @@ -1366,7 +1366,7 @@ private: return ret; } - bool Read_class_row (Process* process, const objc_class_t &objc_class, std::auto_ptr<class_ro_t> &class_ro, std::auto_ptr<class_rw_t> &class_rw) + bool Read_class_row (Process* process, const objc_class_t &objc_class, STD_UNIQUE_PTR(class_ro_t) &class_ro, STD_UNIQUE_PTR(class_rw_t) &class_rw) { class_ro.reset(); class_rw.reset(); |
