From b57e4a1bc6054a5495d6671f108914108852105b Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Mon, 4 Nov 2013 09:33:30 +0000 Subject: Roll back the changes I made in r193907 which created a new Frame pure virtual base class and made StackFrame a subclass of that. As I started to build on top of that arrangement today, I found that it wasn't working out like I intended. Instead I'll try sticking with the single StackFrame class -- there's too much code duplication to make a more complicated class hierarchy sensible I think. llvm-svn: 193983 --- lldb/source/Interpreter/ScriptInterpreterPython.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lldb/source/Interpreter/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp index 87afd3fed59..fc76f0470d3 100644 --- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp +++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp @@ -2196,7 +2196,7 @@ ScriptInterpreterPython::BreakpointCallbackFunction if (python_function_name != NULL && python_function_name[0] != '\0') { - const FrameSP stop_frame_sp (exe_ctx.GetFrameSP()); + const StackFrameSP stop_frame_sp (exe_ctx.GetFrameSP()); BreakpointSP breakpoint_sp = target->GetBreakpointByID (break_id); if (breakpoint_sp) { @@ -2251,7 +2251,7 @@ ScriptInterpreterPython::WatchpointCallbackFunction if (python_function_name != NULL && python_function_name[0] != '\0') { - const FrameSP stop_frame_sp (exe_ctx.GetFrameSP()); + const StackFrameSP stop_frame_sp (exe_ctx.GetFrameSP()); WatchpointSP wp_sp = target->GetWatchpointList().FindByID (watch_id); if (wp_sp) { @@ -2661,7 +2661,7 @@ ScriptInterpreterPython::RunScriptFormatKeyword (const char* impl_function, bool ScriptInterpreterPython::RunScriptFormatKeyword (const char* impl_function, - Frame* frame, + StackFrame* frame, std::string& output, Error& error) { @@ -2682,7 +2682,7 @@ ScriptInterpreterPython::RunScriptFormatKeyword (const char* impl_function, return false; } { - FrameSP frame_sp(frame->shared_from_this()); + StackFrameSP frame_sp(frame->shared_from_this()); Locker py_lock(this); ret_val = g_swig_run_script_keyword_frame (impl_function, m_dictionary_name.c_str(), frame_sp, output); if (!ret_val) -- cgit v1.2.3