1
0
Fork 0

GUI: minimize changes for struct in lambda MSVC 2017 compile fix

This commit is contained in:
Bálint Faragó 2017-11-01 01:55:10 +01:00 committed by Duncan Ogilvie
parent ecd1a3d576
commit 5e67d7ae45
1 changed files with 10 additions and 12 deletions

View File

@ -123,17 +123,6 @@ void BreakpointsView::updateColors()
updateBreakpointsSlot(); updateBreakpointsSlot();
} }
struct Hax
{
const bool & greater;
const QString & s;
Hax(const bool & greater, const QString & s) : greater(greater), s(s) { }
bool operator<(const Hax & b)
{
return greater ? this->s > b.s : this->s < b.s;
}
};
void BreakpointsView::reloadData() void BreakpointsView::reloadData()
{ {
if(mSort.first != -1) //re-sort if the user wants to sort if(mSort.first != -1) //re-sort if the user wants to sort
@ -146,7 +135,16 @@ void BreakpointsView::reloadData()
auto aBp = &mBps.at(a.at(ColAddr).userdata), bBp = &mBps.at(b.at(ColAddr).userdata); auto aBp = &mBps.at(a.at(ColAddr).userdata), bBp = &mBps.at(b.at(ColAddr).userdata);
auto aType = aBp->type, bType = bBp->type; auto aType = aBp->type, bType = bBp->type;
auto aHeader = aBp->addr || aBp->active, bHeader = bBp->addr || bBp->active; auto aHeader = aBp->addr || aBp->active, bHeader = bBp->addr || bBp->active;
Hax aHax(greater, a.at(col).text), bHax(greater, b.at(col).text); struct Hax
{
const bool & greater;
const QString & s;
Hax(const bool & greater, const QString & s) : greater(greater), s(s) { }
bool operator<(const Hax & b)
{
return greater ? s > b.s : s < b.s;
}
} aHax(greater, a.at(col).text), bHax(greater, b.at(col).text);
return std::tie(aType, aHeader, aHax) < std::tie(bType, bHeader, bHax); return std::tie(aType, aHeader, aHax) < std::tie(bType, bHeader, bHax);
}); });
} }