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

Removed DLOGs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12994 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-04-13 12:48:57 +00:00
parent a88a2bc097
commit 6a22f4bd27
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -2439,7 +2439,6 @@ void ArrayCtrl::SortA()
void ArrayCtrl::SortB(const Vector<int>& o)
{
DTIMING("SortB");
Vector<Line> narray;
narray.SetCount(array.GetCount());
Vector<Ln> nln;
@ -2489,8 +2488,7 @@ void ArrayCtrl::Sort(int from, int count, Gate<int, int> order)
for(int i = 0; i < array.GetCount(); i++)
h.Add(i);
SortA();
{ DTIMING("StableSort");
StableSort(SubRange(h, from, count).Write(), order); }
StableSort(SubRange(h, from, count).Write(), order);
SortB(h);
Refresh();
SyncInfo();
@ -2504,7 +2502,6 @@ void ArrayCtrl::Sort(Gate<int, int> order)
bool ArrayCtrl::OrderPred(int i1, int i2, const ArrayCtrl::Order *o)
{
DTIMING("OrderPred");
return (*o)(array[i1].line, array[i2].line);
}
@ -2525,7 +2522,6 @@ struct sAC_ColumnSort : public ValueOrder {
Function<int (const Value& a, const Value& b)> cmp;
virtual bool operator()(const Value& a, const Value& b) const {
DTIMING("Predicated");
return descending ? order ? (*order)(b, a) : cmp(b, a) < 0
: order ? (*order)(a, b) : cmp(a, b) < 0;
}