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
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@138105 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/lldb/Interpreter/ScriptInterpreter.h b/include/lldb/Interpreter/ScriptInterpreter.h
index 21becb6..3056f19 100644
--- a/include/lldb/Interpreter/ScriptInterpreter.h
+++ b/include/lldb/Interpreter/ScriptInterpreter.h
@@ -49,7 +49,7 @@
lldb::DebuggerSP& debugger,
const char* args,
std::string& err_msg,
- lldb_private::CommandReturnObject& cmd_retobj);
+ void* cmd_retobj);
typedef enum
{
diff --git a/scripts/Python/python-wrapper.swig b/scripts/Python/python-wrapper.swig
index 0269104..e74c432 100644
--- a/scripts/Python/python-wrapper.swig
+++ b/scripts/Python/python-wrapper.swig
@@ -590,11 +590,11 @@
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/source/API/SBCommandInterpreter.cpp b/source/API/SBCommandInterpreter.cpp
index 5b3371b..b56ccb4 100644
--- a/source/API/SBCommandInterpreter.cpp
+++ b/source/API/SBCommandInterpreter.cpp
@@ -344,7 +344,7 @@
lldb::DebuggerSP& debugger,
const char* args,
std::string& err_msg,
- lldb_private::CommandReturnObject& cmd_retobj
+ void* cmd_retobj
);
diff --git a/source/Interpreter/ScriptInterpreterPython.cpp b/source/Interpreter/ScriptInterpreterPython.cpp
index 8bfcb21..64efa52 100644
--- a/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/source/Interpreter/ScriptInterpreterPython.cpp
@@ -1946,7 +1946,7 @@
debugger_sp,
args,
err_msg,
- cmd_retobj);
+ (void*)&cmd_retobj);
python_interpreter->LeaveSession ();
}
else
@@ -1960,7 +1960,7 @@
debugger_sp,
args,
err_msg,
- cmd_retobj);
+ (void*)&cmd_retobj);
python_interpreter->LeaveSession ();
ReleasePythonLock ();
}
diff --git a/source/Target/StackFrame.cpp b/source/Target/StackFrame.cpp
index 35df2d2..0e6b02f 100644
--- a/source/Target/StackFrame.cpp
+++ b/source/Target/StackFrame.cpp
@@ -526,7 +526,7 @@
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/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index 745800a..ea95a42 100644
--- a/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
@@ -178,7 +178,7 @@
'inline = ',
'explicit = ',
'content = ',
- '__NSCFString'])
+ 'NSCFString'])
self.expect('frame variable processName -P 1 -Y',
substrs = ['mutable =',
@@ -223,7 +223,7 @@
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',