2 files changed, 7 insertions, 4 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
index 83c58250a94..218e97e08d3 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
@@ -196,7 +196,7 @@ ObjectContainerUniversalMachO::GetArchitectureAtIndex (uint32_t idx, ArchSpec& a
     return false;
 }
 
-ObjectFile *
+ObjectFileSP
 ObjectContainerUniversalMachO::GetObjectFile (const FileSpec *file)
 {
     uint32_t arch_idx = 0;
@@ -219,11 +219,14 @@ ObjectContainerUniversalMachO::GetObjectFile (const FileSpec *file)
         {
             if (arch == curr_arch)
             {
-                return ObjectFile::FindPlugin (m_module, file, m_offset + m_fat_archs[arch_idx].offset, m_fat_archs[arch_idx].size);
+                return ObjectFile::FindPlugin (m_module, 
+                                               file, 
+                                               m_offset + m_fat_archs[arch_idx].offset, 
+                                               m_fat_archs[arch_idx].size);
             }
         }
     }
-    return NULL;
+    return ObjectFileSP();
 }
 
 
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
index 8cc0fbd1e35..989fd6df01a 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
@@ -68,7 +68,7 @@ public:
     virtual bool
     GetArchitectureAtIndex (uint32_t cpu_idx, lldb_private::ArchSpec& arch) const;
 
-    virtual lldb_private::ObjectFile *
+    virtual lldb::ObjectFileSP
     GetObjectFile (const lldb_private::FileSpec *file);
 
     //------------------------------------------------------------------