Revert commits that cause broken builds on GCC buildbots

- build fails due to PyCallable template definition inside an extern "C" scope

This commit reverts 185240, 184893 and 184608.

llvm-svn: 185560
This commit is contained in:
Daniel Malea
2013-07-03 17:58:31 +00:00
parent 4331ac7bd3
commit 9a71a7d81b
14 changed files with 785 additions and 429 deletions

View File

@@ -115,6 +115,7 @@ LLDBSwigPythonCallCommand (const char *python_function_name,
const char *session_dictionary_name,
lldb::DebuggerSP& debugger,
const char* args,
std::string& err_msg,
lldb_private::CommandReturnObject& cmd_retobj);
extern "C" bool
@@ -2969,7 +2970,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
return false;
}
bool ret_val = false;
bool ret_val;
std::string err_msg;
@@ -2994,11 +2995,12 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
m_dictionary_name.c_str(),
debugger_sp,
args,
err_msg,
cmd_retobj);
}
if (!ret_val)
error.SetErrorString("unable to execute script function");
error.SetErrorString(err_msg.c_str());
else
error.Clear();