[Lldb-commits] [lldb] r163332 - in /lldb/trunk: include/lldb/Core/CXXFormatterFunctions.h source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp

[Enrico Granata]

Author: enrico
Date: Thu Sep  6 12:10:14 2012
New Revision: 163332

URL: http://llvm.org/viewvc/llvm-project?rev=163332&view=rev
Log:
Patch from Daniel Malea to fix the build on Linux. Thanks

Modified:
    lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp

Modified: lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h?rev=163332&r1=163331&r2=163332&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h (original)
+++ lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h Thu Sep  6 12:10:14 2012
@@ -10,6 +10,7 @@
 #ifndef liblldb_CXXFormatterFunctions_h_
 #define liblldb_CXXFormatterFunctions_h_
 
+#include <stdint.h>
 #include "lldb/lldb-forward.h"
 
 namespace lldb_private {

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp?rev=163332&r1=163331&r2=163332&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp Thu Sep  6 12:10:14 2012
@@ -280,10 +280,10 @@
 AppleObjCRuntimeV1::ClassDescriptorV1::GetSuperclass ()
 {
     if (!m_valid)
-        return NULL;
+        return AppleObjCRuntime::ClassDescriptorSP();
     ProcessSP process_sp = m_process_wp.lock();
     if (!process_sp)
-        return NULL;
+        return AppleObjCRuntime::ClassDescriptorSP();
     return ObjCLanguageRuntime::ClassDescriptorSP(new AppleObjCRuntimeV1::ClassDescriptorV1(m_parent_isa,process_sp));
 }
 

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=163332&r1=163331&r2=163332&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Thu Sep  6 12:10:14 2012
@@ -605,7 +605,7 @@
 {
     uint64_t ptr_value = in_value.GetValueAsUnsigned(0);
     if (ptr_value == 0)
-        return NULL;
+        return ObjCLanguageRuntime::ClassDescriptorSP();
     
     ObjCISA isa = GetISA(in_value);
     
@@ -848,10 +848,10 @@
 AppleObjCRuntimeV2::ClassDescriptorV2::GetSuperclass ()
 {
     if (!m_valid)
-        return NULL;
+        return ObjCLanguageRuntime::ClassDescriptorSP();
     ProcessSP process_sp = m_process_wp.lock();
     if (!process_sp)
-        return NULL;
+        return ObjCLanguageRuntime::ClassDescriptorSP();
     return AppleObjCRuntime::ClassDescriptorSP(new AppleObjCRuntimeV2::ClassDescriptorV2(m_parent_isa,process_sp));
 }
 

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=163332&r1=163331&r2=163332&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Thu Sep  6 12:10:14 2012
@@ -110,10 +110,10 @@
                         create = !arch->TripleVendorWasSpecified();
                         break;
 
+#endif
                     default:
                         break;
                 }
-#endif
                 if (create)
                 {
                     switch (triple.getOS())