Taking care of an issue with using lldb_private types in SBCommandInterpreter.cpp ; Making NSString test case work on Snow Leopard ; Removing an unused variable warning

llvm-svn: 138105

6 files changed, 9 insertions, 9 deletions

diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreter.h b/lldb/include/lldb/Interpreter/ScriptInterpreter.h
index 21becb6f297..3056f197110 100644
--- a/lldb/include/lldb/Interpreter/ScriptInterpreter.h
+++ b/lldb/include/lldb/Interpreter/ScriptInterpreter.h
@@ -49,7 +49,7 @@ public:
                                                                      lldb::DebuggerSP& debugger,
                                                                      const char* args,
                                                                      std::string& err_msg,
-                                                                     lldb_private::CommandReturnObject& cmd_retobj);
+                                                                     void* cmd_retobj);
 
     typedef enum
     {
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig
index 02691047861..e74c432b098 100644
--- a/lldb/scripts/Python/python-wrapper.swig
+++ b/lldb/scripts/Python/python-wrapper.swig
@@ -590,11 +590,11 @@ LLDBSwigPythonCallCommand
     lldb::DebuggerSP& debugger,
     const char* args,
     std::string& err_msg,
-    lldb_private::CommandReturnObject& cmd_retobj
+    void* cmd_retobj
 )
 {
 
-    not_owning_ap<lldb_private::CommandReturnObject> auto_cmd_retobj(&cmd_retobj);
+    not_owning_ap<lldb_private::CommandReturnObject> auto_cmd_retobj((lldb_private::CommandReturnObject*)cmd_retobj);
 
     bool retval = false;
 
diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp
index 5b3371b62bc..b56ccb4ec17 100644
--- a/lldb/source/API/SBCommandInterpreter.cpp
+++ b/lldb/source/API/SBCommandInterpreter.cpp
@@ -344,7 +344,7 @@ extern "C" bool           LLDBSwigPythonCallCommand
     lldb::DebuggerSP& debugger,
     const char* args,
     std::string& err_msg,
-    lldb_private::CommandReturnObject& cmd_retobj
+    void* cmd_retobj
 );
 
 
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 8bfcb212376..64efa528dd0 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -1946,7 +1946,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             cmd_retobj);
+                                             (void*)&cmd_retobj);
         python_interpreter->LeaveSession ();
     }
     else
@@ -1960,7 +1960,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             cmd_retobj);
+                                             (void*)&cmd_retobj);
         python_interpreter->LeaveSession ();
         ReleasePythonLock ();
     }
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp
index 35df2d20746..0e6b02f5656 100644
--- a/lldb/source/Target/StackFrame.cpp
+++ b/lldb/source/Target/StackFrame.cpp
@@ -526,7 +526,7 @@ StackFrame::GetValueForVariableExpressionPath (const char *var_expr_cstr,
         const bool check_ptr_vs_member = (options & eExpressionPathOptionCheckPtrVsMember) != 0;
         const bool no_fragile_ivar = (options & eExpressionPathOptionsNoFragileObjcIvar) != 0;
         const bool no_synth_child = (options & eExpressionPathOptionsNoSyntheticChildren) != 0;
-        const bool no_synth_array = (options & eExpressionPathOptionsNoSyntheticArrayRange) != 0;
+        //const bool no_synth_array = (options & eExpressionPathOptionsNoSyntheticArrayRange) != 0;
         error.Clear();
         bool deref = false;
         bool address_of = false;
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index 745800a70b1..ea95a427963 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
@@ -178,7 +178,7 @@ class DataFormatterTestCase(TestBase):
                                'inline = ',
                                'explicit = ',
                                'content = ',
-                               '__NSCFString'])
+                               'NSCFString'])
         
         self.expect('frame variable processName -P 1 -Y',
                     substrs = ['mutable =',
@@ -223,7 +223,7 @@ class DataFormatterTestCase(TestBase):
         self.expect('frame variable str10',
                     substrs = ['This is a Unicode string \\xcf\\x83 number 4 right here'])
         self.expect('frame variable str11',
-                    substrs = ['__NSCFString'])
+                    substrs = ['NSCFString'])
         self.expect('frame variable processName',
                     substrs = ['a.out'])        
         self.expect('frame variable str12',