Revert "I had recently added a new SBFrame::GetVariables() overload with yet another bool argument"

This reverts commit r228975.  It was causing link errors
on the Windows bots, since last Thursday.

http://lab.llvm.org:8011/builders/lldb-x86-win7-msvc/builds/725

Conflicts:
	lldb.xcodeproj/project.pbxproj

llvm-svn: 229514

2 files changed, 6 insertions, 62 deletions

diff --git a/lldb/scripts/Python/interface/SBFrame.i b/lldb/scripts/Python/interface/SBFrame.i
index b1d1e4e9215..5cacb5ea1b3 100644
--- a/lldb/scripts/Python/interface/SBFrame.i
+++ b/lldb/scripts/Python/interface/SBFrame.i
@@ -199,7 +199,12 @@ public:
                   lldb::DynamicValueType  use_dynamic);
 
     lldb::SBValueList
-    GetVariables (const lldb::SBVariablesOptions& options);
+    GetVariables (bool arguments,
+                  bool locals,
+                  bool statics,
+                  bool in_scope_only,
+                  bool include_runtime_support_values,
+                  lldb::DynamicValueType  use_dynamic);
              
     lldb::SBValueList
     GetRegisters ();
diff --git a/lldb/scripts/Python/interface/SBVariablesOptions.i b/lldb/scripts/Python/interface/SBVariablesOptions.i
deleted file mode 100644
index 3941a58d7bc..00000000000
--- a/lldb/scripts/Python/interface/SBVariablesOptions.i
+++ /dev/null
@@ -1,61 +0,0 @@
-//===-- SWIG Interface for SBVariablesOptions ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-namespace lldb {
-    
-class SBVariablesOptions
-{
-public:
-    SBVariablesOptions ();
-    
-    SBVariablesOptions (const SBVariablesOptions& options);
-    
-    ~SBVariablesOptions ();
-    
-    bool
-    IsValid () const;
-    
-    bool
-    GetIncludeArguments ()  const;
-    
-    void
-    SetIncludeArguments (bool);
-    
-    bool
-    GetIncludeLocals ()  const;
-    
-    void
-    SetIncludeLocals (bool);
-    
-    bool
-    GetIncludeStatics ()  const;
-    
-    void
-    SetIncludeStatics (bool);
-    
-    bool
-    GetInScopeOnly ()  const;
-    
-    void
-    SetInScopeOnly (bool);
-    
-    bool
-    GetIncludeRuntimeSupportValues () const;
-    
-    void
-    SetIncludeRuntimeSupportValues (bool);
-    
-    lldb::DynamicValueType
-    GetUseDynamic () const;
-    
-    void
-    SetUseDynamic (lldb::DynamicValueType);
-};
-    
-} // namespace lldb