cpp: Sorting and speed improved

git-svn-id: svn://ultimatepp.org/upp/trunk@8495 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-01 15:27:12 +00:00
parent c1b2a4a5dc
commit 41521abc81
3 changed files with 6 additions and 8 deletions

View file

@ -315,10 +315,10 @@ void AssistEditor::SyncAssist()
}
}
}
if(!include_assist) {
LTIMING("Sort assist");
assist.Sort(0, CppItemInfoOrder);
}
// if(!include_assist) {
// LTIMING("Sort assist");
// assist.Sort(0, CppItemInfoOrder);
// }
}
bool AssistEditor::IncludeAssist()

View file

@ -84,7 +84,7 @@ void SerializeCodeBase(Stream& s)
CodeBase().Serialize(s);
}
#define CPP_CODEBASE_VERSION 9
#define CPP_CODEBASE_VERSION 10
void SaveCodeBase()
{

View file

@ -354,9 +354,7 @@ void AssistEditor::GatherItems(const String& type, bool only_public, Index<Strin
bool OrderAssistItems(const CppItemInfo& a, const CppItemInfo& b)
{
if(a.typei != b.typei)
return a.typei < b.typei;
return a.qitem < b.qitem;
return CombineCompare(a.uname, b.uname)(a.typei, b.typei)(a.qitem, b.qitem) < 0;
}
void AssistEditor::RemoveDuplicates()