[Lldb-commits] [lldb] r167253 - in /lldb/trunk: include/lldb/API/SBValue.h source/Interpreter/ScriptInterpreterPython.cpp

[Greg Clayton]

Author: gclayton
Date: Thu Nov  1 16:35:16 2012
New Revision: 167253

URL: http://llvm.org/viewvc/llvm-project?rev=167253&view=rev
Log:
Get rid of hack by making the actual call public. This was causing the lldb-platform to not be able to link.


Modified:
    lldb/trunk/include/lldb/API/SBValue.h
    lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp

Modified: lldb/trunk/include/lldb/API/SBValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBValue.h?rev=167253&r1=167252&r2=167253&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBValue.h (original)
+++ lldb/trunk/include/lldb/API/SBValue.h Thu Nov  1 16:35:16 2012
@@ -413,15 +413,8 @@
     lldb::SBWatchpoint
     WatchPointee (bool resolve_location, bool read, bool write, SBError &error);
 
-    // this must be defined in the .h file because synthetic children as implemented in the core
-    // currently rely on being able to extract the SharedPointer out of an SBValue. if the implementation
-    // is deferred to the .cpp file instead of being inlined here, the platform will fail to link
-    // correctly. however, this is temporary till a better general solution is found. FIXME
     lldb::ValueObjectSP
-    get_sp()
-    {
-        return GetSP();
-    }
+    GetSP () const;
 
 protected:
     friend class SBBlock;
@@ -429,9 +422,6 @@
     friend class SBThread;
     friend class SBValueList;
 
-    lldb::ValueObjectSP
-    GetSP () const;
-    
     // these calls do the right thing WRT adjusting their settings according to the target's preferences
     void
     SetSP (const lldb::ValueObjectSP &sp);

Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp?rev=167253&r1=167252&r2=167253&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Thu Nov  1 16:35:16 2012
@@ -2300,7 +2300,7 @@
             if (value_sb == NULL)
                 Py_XDECREF(child_ptr);
             else
-                ret_val = value_sb->get_sp();
+                ret_val = value_sb->GetSP();
         }
         else
         {