From 41521abc810d203b5b270ce170c7cb004ae3ee87 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 1 Jun 2015 15:27:12 +0000
Subject: [PATCH] cpp: Sorting and speed improved

git-svn-id: svn://ultimatepp.org/upp/trunk@8495 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Assist.cpp       | 8 ++++----
 uppsrc/ide/Browser/Base.cpp | 2 +-
 uppsrc/ide/Cpp.cpp          | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 8d24b9378..b20056137 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -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()
diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp
index 0f0aa580f..128d663f3 100644
--- a/uppsrc/ide/Browser/Base.cpp
+++ b/uppsrc/ide/Browser/Base.cpp
@@ -84,7 +84,7 @@ void SerializeCodeBase(Stream& s)
 	CodeBase().Serialize(s);
 }
 
-#define CPP_CODEBASE_VERSION 9
+#define CPP_CODEBASE_VERSION 10
 
 void SaveCodeBase()
 {
diff --git a/uppsrc/ide/Cpp.cpp b/uppsrc/ide/Cpp.cpp
index e84ec4815..e04932f8c 100644
--- a/uppsrc/ide/Cpp.cpp
+++ b/uppsrc/ide/Cpp.cpp
@@ -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()