diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp index f01734f3f..8d659eac2 100644 --- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp +++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp @@ -158,9 +158,9 @@ void Gdb_MI2::Run() IdeActivateBottom(); } -#ifdef PLATFORM_POSIX void Gdb_MI2::AsyncBrk() { +#ifdef PLATFORM_POSIX // send interrupt command to debugger if(!InterruptDebugger()) return; @@ -174,8 +174,8 @@ void Gdb_MI2::AsyncBrk() if(stopped) break; } -} #endif +} #ifdef flagMT // mutex-protected functions @@ -966,7 +966,7 @@ void Gdb_MI2::SyncLocals() if(name == "this") continue; - localVars.Add(VarItem(this, name)); + localVars.AddPick(VarItem(this, name)); } // create a VarItem for each variable and put evaluation results @@ -1038,7 +1038,7 @@ void Gdb_MI2::SyncLocals(Vector localVars) if(name == "this") continue; - localVars.Add(VarItem(this, name)); + localVars.AddPick(VarItem(this, name)); } // create a VarItem for each variable and put evaluation results @@ -1291,7 +1291,7 @@ void Gdb_MI2::SyncWatches() exp = watches.Get(iWatch, 0); } watchesExpressions << exp; - watchesVars.Add(VarItem(this, exp)); + watchesVars.AddPick(VarItem(this, exp)); val = watchesVars.Top().value; watchesValues.Add(val); { @@ -1343,7 +1343,7 @@ void Gdb_MI2::SyncWatches(Vector watchesVars) { String exp = watches.Get(iWatch, 0); watchesExpressions << exp; - watchesVars.Add(VarItem(this, exp)); + watchesVars.AddPick(VarItem(this, exp)); String val = watchesVars.Top().value; watchesValues.Add(val); watches.Set(iWatch, 1, val); diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.h b/uppsrc/ide/Debuggers/Gdb_MI2.h index bc07b842a..e6273cbfe 100644 --- a/uppsrc/ide/Debuggers/Gdb_MI2.h +++ b/uppsrc/ide/Debuggers/Gdb_MI2.h @@ -54,11 +54,9 @@ class Gdb_MI2 : public Debugger, public ParentCtrl bool InterruptDebugger(void); #endif -#ifdef PLATFORM_POSIX // current command break support -- ONLY POSIX, by now // used to speed up operations in MT mode bool InterruptCommand(void); -#endif // used to post and kill timed callbacks TimeCallback timeCallback; diff --git a/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp b/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp index 6b9f079da..ebf704c8b 100644 --- a/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp +++ b/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp @@ -37,7 +37,7 @@ void Gdb_MI2::SyncExplorer() if(vItem.kind == VarItem::COMPLEX) children = vItem.GetChildren(); else - children << vItem; + children.AddPick(vItem); RaiseIfStop(); @@ -109,7 +109,7 @@ void Gdb_MI2::SyncExplorer(Vector children) if(vItem.kind == VarItem::COMPLEX) children = vItem.GetChildren(); else - children << vItem; + children.AddPick(vItem); // fill explorer memners expressions, short expressions and values explorerExpressions.Clear(); diff --git a/uppsrc/ide/Debuggers/VarItem.cpp b/uppsrc/ide/Debuggers/VarItem.cpp index 885e87cef..2e8076cf3 100644 --- a/uppsrc/ide/Debuggers/VarItem.cpp +++ b/uppsrc/ide/Debuggers/VarItem.cpp @@ -39,7 +39,7 @@ VarItem::~VarItem() Clear(); } -VarItem const &VarItem::operator=(pick_ VarItem &v) +VarItem& VarItem::operator=(pick_ VarItem &v) { if(!varName.IsEmpty() && varName.Find('.') < 0) debugger->MICmd("var-delete " + varName); @@ -167,11 +167,11 @@ Vector VarItem::GetChildren0(MIValue const &val, String const &prePath MIValue val2 = debugger->MICmd("var-list-children 1 " + nam); if(!val2.IsTuple()) continue; - res.Append(GetChildren0(val2, prePath)); + res.AppendPick(GetChildren0(val2, prePath)); } else { - VarItem &v = res.Add(VarItem(debugger)); + VarItem &v = res.AddPick(VarItem(debugger)); v.empty = false; v.varName = nam; v.shortExpression = prePath + "." + exp; diff --git a/uppsrc/ide/Debuggers/VarItem.h b/uppsrc/ide/Debuggers/VarItem.h index 6b6012e89..1d147de7f 100644 --- a/uppsrc/ide/Debuggers/VarItem.h +++ b/uppsrc/ide/Debuggers/VarItem.h @@ -90,7 +90,7 @@ class VarItem : Moveable // copy (pick) VarItem(pick_ VarItem &v); - VarItem const &operator=(pick_ VarItem &v); + VarItem& operator=(pick_ VarItem &v); // get children VectorGetChildren(void);