commit 10de7d1db3ec782ea2ccda1f39c0a40b9c301594
author Jim Ingham <jingham@apple.com> Wed May 04 03:43:18 2011 +0000
committer Jim Ingham <jingham@apple.com> Wed May 04 03:43:18 2011 +0000
tree 7310280a04cee6ba21e48a0ef7e6d90abe3c0399
parent cf6076809b8956d5cd94a1f4589baeb435cb818e

Change "frame var" over to using OptionGroups (and thus the OptionGroupVariableObjectDisplay).
Change the boolean "use_dynamic" over to a tri-state, no-dynamic, dynamic-w/o running target,
and dynamic with running target.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@130832 91177308-0d34-0410-b5e6-96231b3b80d8

source/API/SBFrame.cpp

diff --git a/source/API/SBFrame.cpp b/source/API/SBFrame.cpp
index 9a42ae0..0a5988e 100644
--- a/source/API/SBFrame.cpp
+++ b/source/API/SBFrame.cpp
@@ -343,12 +343,12 @@
 SBValue
 SBFrame::FindVariable (const char *name)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType  use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return FindVariable (name, use_dynamic);
 }
 
 SBValue
-SBFrame::FindVariable (const char *name, bool use_dynamic)
+SBFrame::FindVariable (const char *name, lldb::DynamicValueType use_dynamic)
 {
     VariableSP var_sp;
     SBValue sb_value;
@@ -389,12 +389,12 @@
 SBValue
 SBFrame::FindValue (const char *name, ValueType value_type)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return FindValue (name, value_type, use_dynamic);
 }
 
 SBValue
-SBFrame::FindValue (const char *name, ValueType value_type, bool use_dynamic)
+SBFrame::FindValue (const char *name, ValueType value_type, lldb::DynamicValueType use_dynamic)
 {
     SBValue sb_value;
     if (m_opaque_sp && name && name[0])
@@ -579,7 +579,7 @@
                        bool statics,
                        bool in_scope_only)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return GetVariables (arguments, locals, statics, in_scope_only, use_dynamic);
 }
 
@@ -588,7 +588,7 @@
                        bool locals,
                        bool statics,
                        bool in_scope_only,
-                       bool use_dynamic)
+                       lldb::DynamicValueType  use_dynamic)
 {
     LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -706,12 +706,12 @@
 SBValue
 SBFrame::EvaluateExpression (const char *expr)
 {
-    bool use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
+    lldb::DynamicValueType use_dynamic = m_opaque_sp->CalculateTarget()->GetPreferDynamicValue();
     return EvaluateExpression (expr, use_dynamic);
 }
 
 SBValue
-SBFrame::EvaluateExpression (const char *expr, bool fetch_dynamic_value)
+SBFrame::EvaluateExpression (const char *expr, lldb::DynamicValueType fetch_dynamic_value)
 {
     Mutex::Locker api_locker (m_opaque_sp->GetThread().GetProcess().GetTarget().GetAPIMutex());
 
@@ -732,8 +732,8 @@
         exe_results = m_opaque_sp->GetThread().GetProcess().GetTarget().EvaluateExpression(expr, 
                                                                                            m_opaque_sp.get(), 
                                                                                            unwind_on_error, 
-                                                                                           fetch_dynamic_value, 
                                                                                            keep_in_memory, 
+                                                                                           fetch_dynamic_value, 
                                                                                            *expr_result);
     }