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

1 files changed, 0 insertions, 20 deletions

diff --git a/lldb/source/API/SBCommandReturnObject.cpp b/lldb/source/API/SBCommandReturnObject.cpp
index e94c0174819..b0533e132db 100644
--- a/lldb/source/API/SBCommandReturnObject.cpp
+++ b/lldb/source/API/SBCommandReturnObject.cpp
@@ -8,10 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/API/SBCommandReturnObject.h"
-#include "lldb/API/SBError.h"
 #include "lldb/API/SBStream.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 
@@ -331,21 +329,3 @@ SBCommandReturnObject::Printf(const char* format, ...)
     return 0;
 }
 
-void
-SBCommandReturnObject::SetError (lldb::SBError &error, const char *fallback_error_cstr)
-{
-    if (m_opaque_ap.get())
-    {
-        if (error.IsValid())
-            m_opaque_ap->SetError(error.ref(), fallback_error_cstr);
-        else if (fallback_error_cstr)
-            m_opaque_ap->SetError(Error(), fallback_error_cstr);
-    }
-}
-
-void
-SBCommandReturnObject::SetError (const char *error_cstr)
-{
-    if (m_opaque_ap.get() && error_cstr)
-        m_opaque_ap->SetError(error_cstr);
-}