diff options
Diffstat (limited to 'lldb/source')
| -rw-r--r-- | lldb/source/API/SBCommandInterpreter.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/API/SBDebugger.cpp | 5 | ||||
| -rw-r--r-- | lldb/source/Interpreter/ScriptInterpreterPython.cpp | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp index b56ccb4ec17..5b3371b62bc 100644 --- a/lldb/source/API/SBCommandInterpreter.cpp +++ b/lldb/source/API/SBCommandInterpreter.cpp @@ -344,7 +344,7 @@ extern "C" bool LLDBSwigPythonCallCommand lldb::DebuggerSP& debugger, const char* args, std::string& err_msg, - void* cmd_retobj + lldb_private::CommandReturnObject& cmd_retobj ); diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 3fa44bb27ae..70ca8b286db 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -128,6 +128,11 @@ SBDebugger::SBDebugger () : { } +SBDebugger::SBDebugger(const lldb::DebuggerSP &debugger_sp) : + m_opaque_sp(debugger_sp) +{ +} + SBDebugger::SBDebugger(const SBDebugger &rhs) : m_opaque_sp (rhs.m_opaque_sp) { diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp index 64efa528dd0..588e2c15651 100644 --- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp +++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp @@ -20,6 +20,7 @@ #include "lldb/API/SBFrame.h" #include "lldb/API/SBBreakpointLocation.h" +#include "lldb/API/SBCommandReturnObject.h" #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Timer.h" @@ -1930,7 +1931,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function, } ScriptInterpreterPython *python_interpreter = this; - + lldb::DebuggerSP debugger_sp = m_interpreter.GetDebugger().GetSP(); bool ret_val; @@ -1946,7 +1947,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function, debugger_sp, args, err_msg, - (void*)&cmd_retobj); + cmd_retobj); python_interpreter->LeaveSession (); } else @@ -1960,7 +1961,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function, debugger_sp, args, err_msg, - (void*)&cmd_retobj); + cmd_retobj); python_interpreter->LeaveSession (); ReleasePythonLock (); } @@ -1969,7 +1970,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function, error.SetErrorString(err_msg.c_str()); else error.Clear(); - + return ret_val; |
