github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Gdb_M2: Fixed to compile in Win32

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6953 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-25 18:20:29 +00:00
parent c9501fb8aa
commit 52f808c4c1
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ide/Debuggers/Gdb_MI2.cpp
View file

@ -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<VarItem> 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<VarItem> 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);

2
uppsrc/ide/Debuggers/Gdb_MI2.h
View file

@ -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;

4
uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp
View file

@ -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<VarItem> 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();

6
uppsrc/ide/Debuggers/VarItem.cpp
View file

@ -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> 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;

2
uppsrc/ide/Debuggers/VarItem.h
View file

@ -90,7 +90,7 @@ class VarItem : Moveable<VarItem>
// copy (pick)
VarItem(pick_ VarItem &v);
VarItem const &operator=(pick_ VarItem &v);
VarItem& operator=(pick_ VarItem &v);
// get children
Vector<VarItem>GetChildren(void);