4 files changed, 5 insertions, 72 deletions
diff --git a/include/lldb/API/SBCommandContext.h b/include/lldb/API/SBCommandContext.h
deleted file mode 100644
index b844be2ca..000000000
--- a/include/lldb/API/SBCommandContext.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//===-- SBCommandContext.h --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBCommandContext_h_
-#define LLDB_SBCommandContext_h_
-
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class SBCommandContext
-{
-public:
-
-    SBCommandContext (lldb_private::Debugger *lldb_object);
-
-    ~SBCommandContext ();
-
-    bool
-    IsValid () const;
-
-private:
-
-    lldb_private::Debugger *m_opaque;
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBCommandContext_h_
diff --git a/scripts/Python/build-swig-Python.sh b/scripts/Python/build-swig-Python.sh
index d04f0eabf..dffc466c0 100755
--- a/scripts/Python/build-swig-Python.sh
+++ b/scripts/Python/build-swig-Python.sh
@@ -35,7 +35,6 @@ HEADER_FILES="${SRC_ROOT}/include/lldb/lldb-types.h"\
 " ${SRC_ROOT}/include/lldb/API/SBBreakpoint.h"\
 " ${SRC_ROOT}/include/lldb/API/SBBreakpointLocation.h"\
 " ${SRC_ROOT}/include/lldb/API/SBBroadcaster.h"\
-" ${SRC_ROOT}/include/lldb/API/SBCommandContext.h"\
 " ${SRC_ROOT}/include/lldb/API/SBCommandInterpreter.h"\
 " ${SRC_ROOT}/include/lldb/API/SBCommandReturnObject.h"\
 " ${SRC_ROOT}/include/lldb/API/SBCompileUnit.h"\
@@ -50,13 +49,15 @@ HEADER_FILES="${SRC_ROOT}/include/lldb/lldb-types.h"\
 " ${SRC_ROOT}/include/lldb/API/SBModule.h"\
 " ${SRC_ROOT}/include/lldb/API/SBProcess.h"\
 " ${SRC_ROOT}/include/lldb/API/SBSourceManager.h"\
+" ${SRC_ROOT}/include/lldb/API/SBStream.h"\
 " ${SRC_ROOT}/include/lldb/API/SBStringList.h"\
 " ${SRC_ROOT}/include/lldb/API/SBSymbol.h"\
 " ${SRC_ROOT}/include/lldb/API/SBSymbolContext.h"\
 " ${SRC_ROOT}/include/lldb/API/SBTarget.h"\
 " ${SRC_ROOT}/include/lldb/API/SBThread.h"\
 " ${SRC_ROOT}/include/lldb/API/SBType.h"\
-" ${SRC_ROOT}/include/lldb/API/SBValue.h"
+" ${SRC_ROOT}/include/lldb/API/SBValue.h"\
+" ${SRC_ROOT}/include/lldb/API/SBValueList.h"
 
 
 if [ $Debug == 1 ]
diff --git a/scripts/lldb.swig b/scripts/lldb.swig
index adaa09484..6c505d242 100644
--- a/scripts/lldb.swig
+++ b/scripts/lldb.swig
@@ -98,6 +98,7 @@
 #include "lldb/API/SBThread.h"
 #include "lldb/API/SBType.h"
 #include "lldb/API/SBValue.h"
+#include "lldb/API/SBValueList.h"
 using namespace lldb_private;
 %}
 
@@ -152,6 +153,7 @@ typedef int StopReason;
 %include "lldb/API/SBThread.h"
 %include "lldb/API/SBType.h"
 %include "lldb/API/SBValue.h"
+%include "lldb/API/SBValueList.h"
 %include "lldb/lldb-types.h"
 
 
diff --git a/source/API/SBCommandContext.cpp b/source/API/SBCommandContext.cpp
deleted file mode 100644
index 35bd6bb7c..000000000
--- a/source/API/SBCommandContext.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//===-- SBCommandContext.cpp ------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/Debugger.h"
-#include "lldb/Interpreter/CommandReturnObject.h"
-
-#include "lldb/API/SBCommandContext.h"
-
-
-using namespace lldb;
-using namespace lldb_private;
-
-
-SBCommandContext::SBCommandContext (Debugger *lldb_object) :
-    m_opaque (lldb_object)
-{
-}
-
-SBCommandContext::~SBCommandContext ()
-{
-}
-
-bool
-SBCommandContext::IsValid () const
-{
-    return m_opaque != NULL;
-}
-